simplified login
Merge branch 'facebook'