Add facebook login
Merge origin/master