no message
Merge branch 'master' of https://github.com/Abce/CrossApp

Conflicts:
	CocosDenshion/proj.win32/CocosDenshion.vcxproj
……