Add header template
Rearrange css stylehseets to indivdual app sections
Merge branch 'master' into dev