First pages
Fix fix fix
Merge branch 'master' into mobile-tweaks

Conflicts:
	app/styles/_sidebar.scss
	app/templates/pages/cover.hbs
Round 155 changes
Merge branch 'master' into mobile-tweaks