Merge branch 'projects' into develop

Conflicts:
	Gemfile
	config/initializers/devise.rb