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
change some const char* to const std::string&
Fixed bugs
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string

Conflicts:
	cocos/2d/renderer/CCNewSprite.cpp
	cocos/2d/renderer/CCNewSprite.h
	cocos/2d/renderer/CCNewTextureAtlas.cpp
	cocos/2d/renderer/CCNewTextureAtlas.h
1. add Spine LUA binding with testcase; 2. CCSkeleton inherites from Node since NodeRGBA is deprecated.
change some const char* to const std::string&
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string

Conflicts:
	cocos/2d/renderer/CCNewSpriteBatchNode.cpp
	cocos/2d/renderer/CCNewSpriteBatchNode.h
Merge branch 'lua_spine_dev' of https://github.com/edwardzhou/cocos2d-x into Spine
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
fix actionTest->ActionFollow, ActionCatmullRomStacked
fix actionTest->ActionCardinalSplineStacked
fix actionTest->ActionCardinalSpline，ActionCatmullRom