assdas
asd
Merge branch 'AffirmGame' of https://github.com/momoplan/gameiphone into AffirmGame

Conflicts:
	GameGroup/PublicClass/Class/UserManager.m