* 资源加载与客户端逻辑分离
Merge branch 'master' of https://github.com/zpublic/zpublic into sum_circe

Conflicts:
	src/coeus/client/game_create_role_dlg.cpp
	src/coeus/game_common/config/config_manager.cpp
Merge pull request #42 from zpublic/sum_circe

Sum circe