Before make Facebook log in
Merge branch 'master' of https://github.com/masacandy/cavy_james