Merge branch '5.0' of https://gitserver.xunjoy.com/zhangyang/zhipuzi_pos_windows into 5.0

# Conflicts:
#	DuiLib/Core/UIBase.cpp
#	DuiLib/Core/UIManager.cpp
#	DuiLib/Core/UIManager.h
#	bin/Win32/Release/zhipuzi_pos_windows/DuiLib.dll
#	bin/Win32/Release/zhipuzi_pos_windows/zhipuzi_pos_windows.exe
#	dll/release/DuiLib.dll
#	pdb/release/DuiLib.pdb