reset
Facade static变量大写
VoObject如何同步显示到UI上。
Merge branch 'master' of https://github.com/pzhifeng/client-main into liuzhuang
update
Conflicts:
	client-main/Classes/Facade.cpp
	client-main/Classes/SceneMain.cpp