Squashed 'app/' changes from 7badae4..38beeae

38beeae added master header and footer includes

git-subtree-dir: app
git-subtree-split: 38beeae719b07c53fe3952be9eeb51ba48f8cec6
Merge commit '40249ad0d96e76ccef385f5f2d864006dc381e64'