Bug fix FB Connect
Merge conflict
Merge branch 'master' of https://github.com/bubobox/pronocup