Merge branch 'header-footer'
Merge branch 'master' of https://github.com/BYUI-Web/framework-build