Merge branch 'develop'

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