Merge pull request #1 from Jojatekok/master

Added support for Facebook login; other changes
Merge remote-tracking branch 'upstream/master'