Signed-off-by: Peter <mcheung63@hotmail.com>
Merge branch 'master' of https://github.com/mcheung63/titan-server

Conflicts:
	src/main/java/com/titanserver/TitanServer.java


Signed-off-by: Peter <mcheung63@hotmail.com>