Application.css now includes main.css, instead of requiring the tree.
Merge branch 'static-pages' into develop

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/splash.css.scss