Merge pull request #42 from worldintime/iba_59_improve_users_registration

Refactor and improve Users#create
Merge pull request #49 from worldintime/forgot_password_fix

add user_name to forgot password template
Merge remote-tracking branch 'origin/iba_62_add_username_to_search_response'
fix tests and add user_name to response
resolve merge conflicts