fixes issue #63
fixed unit tests
fixed merge with master
removed console log
refactored relogin
removed unnecessary email args
fixed user. call
fixed user. call
resolved conflicts
Merge pull request #75 from jembi/fix-issue-63-password-reset

fixes issue #63