Cs 1987 Make Devise and Salesforce Coexist Peacefully

This pull request is concerned with [cs challenge 1987 - Make Devise and Salesforce Coexist Peacefully](http://www.cloudspokes.com/challenges/1987)