Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.
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.
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
closed #3492: LabelBMFont string can't be shown integrally.
Issue URL:  http://www.cocos2d-x.org/issues/3492
Merge pull request #4630 from dumganhar/iss3492-bmfont-fix

closed #3492: LabelBMFont string can't be shown integrally.
Update CHANGELOG [ci skip]
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