Including 'quiet_assets' gem
Including 'launchy' gem
Adjusts in PagesController + including features specs
Merge branch 'master' into layout

Conflicts:
	app/views/pages/_form.html.haml
	app/views/pages/index.html.haml