added header and footer to merge page
Merge remote-tracking branch 'boris_webapp/webapp' into webapp