cccomrender change
Merge branch 'v2' of github.com:cocos2d/cocos2d-x into cocos2dv2
add action timeline
fix bug: color&
add action timeline test
Merge pull request #7066 from geron-cn/cocos2dv2

cccomrender change
change NodeCache to NodeReader
Merge branch 'v2' of https://github.com/cocos2d/cocos2d-x into v2

Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
fixed missing files for test case of 'Texture2d'.
fixed non responsive in test case of curl.
Merge pull request #7072 from Dhilan007/v2

fixed missing files for test case of 'Texture2d'.
fixed missing files for test case of 'Texture2d'
Merge pull request #7073 from Dhilan007/v2

fixed missing files for test case of 'Texture2d'
add json test to UIButton
adjust v2 Xcode project of TestCpp
add json loader to checkbox
add json&binary switchable
Merge pull request #11 from pipu/v2_kaile

V2 kaile
update submodule
Merge branch 'v2' of https://github.com/2youyouo2/cocos2d-x into v2
add timeline to muti platform