+ added custom_auth_token field to user for auth
+ some changes in auth