Added javadoc
Merge remote-tracking branch 'remotes/origin/serverDev' into gameServer

Conflicts:
	Server/src/interaction/CommandHandler.java