setup project for win32
Merge branch 'develop' of https://github.com/youlanhai/cocos2d-x into develop
change res
Merge branch 'develop' of https://github.com/youlanhai/cocos2d-x into develop

Conflicts:
	cocos/2d/cocos2d.vcxproj.filters