fix armature draw
update render
Merge branch 'render' of https://github.com/2youyouo2/cocos2d-x into render

Conflicts:
	extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.cpp
	extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h
change CCArmature::boundingBox to apply CCNode::boundingBox
update CCBatchNode render
1.fix read data crash
2.improve performance
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
improve performance
Merge branch 'master' into render

Conflicts:
	extensions/CocoStudio/Armature/CCArmature.cpp
	extensions/CocoStudio/Armature/display/CCSkin.cpp
add TEST_PERFORMANCE_BATCHNODE test
1.fix some android device Async load crash
2.modify TestPerformance
3.fix CCBatchNode removeChild method crash
fix asynchronous reading error
add gotoAndPlay and gotoAndPause method
if call gotoAndPlay function, do not emit a frame event
1.fix when update delta is big, the frame event do not emit.
2.fix CCColliderDetector::setActive crash
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
1. support read scaled resource
revert .sln
1. fix if frame event is at the last frame, it may emit event several times
2. add method for removing single data info
3. add test TEST_DIRECT_LOADING
4. add test TEST_FRAME_EVENT
5. add method for getting calculated collider vertex
upload resource