little fix
Merge branch 'master' of https://github.com/oehm/AndroidChat
need to pull
Merge branch 'master' of https://github.com/oehm/AndroidChat

Conflicts:
	src/com/torben/androidchat/ChatServer_Client.java
	src/com/torben/androidchat/Client_ChatRoom_Sockets.java