Merge branch 'lua_spine_dev' of https://github.com/edwardzhou/cocos2d-x into Spine
Merge branch 'develop' into data-refactor

Conflicts:
	tools/tolua/cocos2dx.ini
Reverts FileUtil::getFileData to virtual function.
Merge pull request #4529 from dumganhar/data-refactor

close #3495 :Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4634 from CocosRobot/updategeneratedsubmodule_1387875601

[AUTO] : updating submodule reference to latest autogenerated bindings
fix clippingNode bug
Merge pull request #4635 from dabingnn/develop_FixClippingNodeBug

fix clippingNode bug
Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.
Update CHANGELOG [ci skip]
Adds missing ‘)’.
fixed #3456
Compilation error fixes.
Remove "_renderer" from widget
issue #3456 replace jsoncpp to rapidjson.
Merge pull request #4638 from dumganhar/getStringFromFile

Don’t use FileUtils::getInstance()->getFileData, use getStringFromFile and getDataFromFile instead.
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