rename user_token to auth_token
Merge branch 'master' into add_simple_form