Merge pull request #35 from XboxLeaders/master

Merging master into develop
friend count fix
Merge pull request #36 from XboxLeaders/develop

Friend count fix