Add FB Login
Merge branch 'fb-login' into dev