overhauled sign in process
Merge branch 'staging'