highbros
Merge branch 'develop' of https://github.com/highbrow-developer/cocos2d-x into develop

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj