Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/static_pages.js.coffee
	app/assets/stylesheets/static_pages.css.scss
	app/controllers/static_pages_controller.rb
	app/helpers/static_pages_helper.rb
	app/views/layouts/application.html.erb
	app/views/static_pages/help.html.erb
	app/views/static_pages/home.html.erb
	config/routes.rb
	spec/requests/static_pages_spec.rb