Better way to get the salesforce user
Merge branch 'master' of github.com:ivanrodriguez5/CloudBreak

Conflicts:
	app/controllers/Application.scala