added email to login returned data
Merge remote-tracking branch 'origin/Develop' into Develop