UserBundle uses 'email' instead of 'e-mail'
Merge pull request #68 from nielsz/patch-2

UserBundle uses 'email' instead of 'e-mail'
Merge branch '1.3'