Modifications to userlogin to persist tokens on DB
Merge branch 'master' of https://github.com/avalliani/betareturn