Implemented OAuth Facebook authentication.
Merge
Fix merge conflict