Made login return a user object
Merge branch 'master' of https://github.com/beaulm/apibase