Implemented Facebook login
Fixed merge conflicts