Fixes to asset manager in the MASTER branch
Remove NodeRGBA inherit
Add samples
Remove CCDictionary from GUIReader
Merge branch 'develop' into develop_nutty_modify_framework_newrender
Fixed bugs
fixed #3456
Remove "_renderer" from widget
issue #3456 replace jsoncpp to rapidjson.
issue #3456 ios test rapidjson.
Merge branch 'develop' into #3456

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCDataReaderHelper.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
Merge branch 'develop' of github.com:cocos2d/cocos2d-x into 3d-extension

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/cocos2d.vcxproj.filters
	samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTest.cpp
Merge branch 'develop' into develop_nutty_modify_framework_newrender
change play interface name
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #3456
Merge branch 'develop' into develop_nutty_modify_framework_newrender
upload trigger code.
Merge branch '3d-extension' of github.com:houguohua/cocos2d-x into 3d-extension
Fixed bugs about color and opacity