Added email address to serialization of User.
Merge branch 'origin/develop'