tmp
Merge branch 'master' of https://github.com/TranCiro/GangPlay

Conflicts:
	bin/GangPlay.apk
	bin/classes.dex
	bin/classes/com/example/gangplay/ClientActivity.class
	bin/classes/com/example/gangplay/ClientNetComService$netThread.class
	bin/classes/com/example/gangplay/ServerNetComService$ServerNetThread.class
	bin/classes/com/example/gangplay/ServerPlayerActivity$AsyncNetTransfer.class
	bin/classes/com/example/gangplay/ServerPlayerActivity$AsyncPlayerSeekBar.class
	bin/classes/com/example/gangplay/ServerPlayerActivity$IncomingCallReceiver.class
	bin/classes/com/example/gangplay/ServerPlayerActivity.class
	bin/resources.ap_
Rimozione nome device