Merge branch 'master' into feature/cloud

Conflicts:
	app/models/user.rb