Cleanup and start restyling the main template
Merge branch 'develop' of https://github.com/cellofellow/symphony into develop

Conflicts:
	library/templates/library/app.html
Merge branch 'develop' of https://github.com/cellofellow/symphony into develop