Merge conference site

by gerg werk