Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/application.html.erb