Game and Client fixes
Merge branch 'master' of https://github.com/ciolben/pokernfc.git

Conflicts:
	bin/PokerNFC.apk
	bin/classes.dex