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