fix user_controller_spec when testing too long usernames
fix user_controller_spec when testing too long usernames
fix conflict
Merge pull request #1412 from eparreno/bug/fix_users_controller_spec

fix user_controller_spec when testing too long usernames