Merge branch 'master' of https://github.com/cjeffery/sworsorc

Conflicts:
	src/server/systemServer/NetworkClient.java