Merge pull request #5 from carnar/develop

Ready to test fb connect
Merge pull request #6 from carnar/master

Merge pull request #5 from carnar/develop