add user email and id
Merge remote-tracking branch 'herooku/master'