Merge pull request #22 from SoftwareMarbles/fix-auth-conflict

Solved a silent overwriting of app's auth controller
Added missing returns for local startegy js
Merge pull request #23 from cholalabs/patch-1

Added missing returns for local startegy js