Some edits!
Merge origin/Netclient_rewrite into Netclient_rewrite

Conflicts:
	src/server/systemServer/MessagePhoenix.java
	src/server/systemServer/NetworkClient.java