Branch to resolve conflict
resolving conflict attempt #3
Revert "resolving conflict attempt #3"

This reverts commit 63842f18b5707a6b5da94bb4c50dfec16b4cecd8.
Merge branch 'FacebookLogin'