Merge branch 'develop' into 31-user-auth

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