Merge branch 'pages' into staging

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/views/root/index.html.erb
	config/database.yml
	config/deploy.yml