Fixed Facebook login handling
Merge branch 'master' of github.com:devmerge/frontend