Small changes
Merge branch 'master' into ClientDevelopment

Conflicts:
	GameProject/bin/server/ListenClientThread.class
	GameProject/bin/server/TicLoopThread.class
Small changes
Small pictures
different changes