Cleaned up sign in/forgot password
Merge branch 'beta'