Added header and footer templates
Merge branch 'cms'