Merge branch 'develop' into perf-callback

Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj