Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj