reduce useless convert
Fixes to asset manager in the MASTER branch
Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.
issue #2050: unsigned int to int
Merge pull request #1 from cocos2d/develop

sync with cocos2d-x
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.
issue #2050: delete max/minGID, fix firstGID bug
issue #2050: use static_cast
Binds FileUtils::getStringFromFile automatically since we have added this method.
Updates tools/tojs(tolua)/cocos2dx.ini.
Changes the type of FontFreeType::_ttfData from `unsigned char*` to `Data`, makes codes more elegant.
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor

Conflicts:
	cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
Fixes linux build failure.
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor

Conflicts:
	tools/tolua/cocos2dx.ini
Merge branch 'data-refactor' of https://github.com/dumganhar/cocos2d-x into data-refactor
Remove NodeRGBA inherit
Add samples