Fix issue with header and footer content merge
Fix page/template re-definition issue
Merge branch 'master' into unimelb