Removed mobile and telephone from users controller create method
fixed email id conflict
Merge branch 'master' of https://github.com/StyleASD/team_citadel into marketplace