authtenticate users with their own credentials
Merge branch 'staging'