Merge pull request #335 from ajthompson/sbl-dev

Removed the email field from core User