Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test
Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test

Conflicts:
	GameServer/Characters.cpp
Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test