Merge branch 'master' of https://github.com/XinCao/gameserver

Conflicts:
	build/built-jar.properties
	src/gameserver/network/client/CM_LOGIN.java

merge