changed Listener to ClientHandler
renamed stuff
Merge branch 'master' into sgmbranch

Conflicts:
	src/client/Client.java
mader server its own thread