Merge remote-tracking branch 'upstream/master' into devel-merge

Conflicts:
	app/controllers/users_controller.rb
	app/views/common/_fav.html.haml
	app/views/organizations/_footer.html.haml