issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror
Fixes to asset manager in the MASTER branch
Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
add support for tweenRotate property
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
spine simple JS binding supported
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
spine android build phase moved
Add SpineTest to TestJavascript 1
undo my mistake
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor

Conflicts:
	cocos/2d/CCUserDefault.cpp
	cocos/2d/CCUserDefault.mm
	cocos/2d/CCUserDefaultAndroid.cpp
	cocos/2d/ZipUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCSAXParser.cpp
[Data Refactor] compilation error fix.
Small bug fix in CCData.
Updates CCUserDefaultAndroid.cpp.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Binds FileUtils::getStringFromFile automatically since we have added this method.
Updates tools/tojs(tolua)/cocos2dx.ini.