fix header syntax in subpage layout and conference page
Merge branch 'master' into gh-pages