Merge branch 'master' into qa

Conflicts:
	app/models/user_session.rb