Merge pull request #1 from cocos2d/develop

update cc2dx/develop
add check data valid in getStringFromFile

so far no check would be crashed when getData faild.
maybe return an empty string is better.
closed #3688, Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
closed #3714, Remove configurations which are not necessary in AndroidManifest.xml of aneroid projects.
use data.isNull() instead of !data.getBytes()
Update CHANGELOG [ci skip]
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5079 from CocosRobot/updategeneratedsubmodule_1389840190

[AUTO] : updating submodule reference to latest autogenerated bindings
More renderer optimizations
Merge pull request #5081 from ricardoquesada/renderer_optimizations

More renderer optimizations
closed #3723, Make sure the init method of Cocos2dxHelper only invoked once.
1.Fix crash bug when using unknown character
2.Fix text align mistake
Merge pull request #5072 from natural-law/develop

closed #3688, LabelAtlas set a shorter string than before, the effect will be wrong.
Update CHANGELOG [ci skip]
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into android_bugs
Merge pull request #5070 from hbbalfred/develop

closed #3725: Crash if file doesn't exist when using FileUtils::getStringFromFile
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Merge pull request #5083 from natural-law/android_bugs

Solve some bugs on android