Update SalesforceLogin.java
Update to Controllers and AccountService and LoginServiceImpl
merge conflict commit