FB integration - continued
Merge branch 'master' of https://github.com/VDubb/Contenders