simplified login function
Merge branch 'facebook'