username/email attribute user model fix
Merge branch 'master' of https://github.com/Teman/cms