settings
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	app/mailers/user_mailer.rb