Add Facebook login
Merge branch 'develop'