add user id for client
Merge branch 'master' of github.com:3jsirios/mafia

Conflicts:
	mafia-server/bin/mafia/Analizer.class
	mafia-server/bin/mafia/GUI.class
	mafia-server/bin/mafia/User.class
	mafia-server/bin/mafia/UserList.class
ignore class