Static pages
Merge branch 'origin/master'

Conflicts:
	app/assets/stylesheets/landing_page.css.scss