Added Facebook login
Merge
Merge