Merge branch 'content'

This reverts commit 2038c6b665df9d1dac87b6ce03d614c3acf0c695, reversing
changes made to e6d1ba4ad9d1d097734f08dcc628c3d858258b45.

Conflicts:
	app/css/app.css
	app/index.html
	app/scss/_appstyles.css
	app/scss/_appstyles.scss
	app/scss/_settings.scss