Merge pull request #2816 from dumganhar/develop

[develop] new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
Merge pull request #2818 from dumganhar/develop

[develop] Minor fix for CCSprite::draw(), checking whether texture is valid, if it's invalid, don't set the attribute for it.
fixed #2161: don't close AssetManager
Merge pull request #2820 from minggo/develop

fixed #2161: don't close AssetManager
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #2822 from CocosRobot/updategeneratedsubmodule_1370662398

[AUTO] : updating submodule reference to latest autogenerated bindings
fixed #2266:make CCFileUtil::getFileData() get data correctly
Merge pull request #2826 from minggo/develop

make CCFileUtil::getFileData() get data correctly
fixed #2161: fixed crash of loading ETC file
Merge pull request #2828 from minggo/develop

fixed #2161: fixed crash of loading ETC file
issue #2271: fixed memory leak of CCControlColorPicker
issue #2271: fixed memory leak of WebSocket
issue #2271: fixed memory leak of CCTextureCache::snapshotTextures()
Merge pull request #2840 from minggo/develop

fix some memory leak
[Android] Don't use c++11 feature in OpenSLEngine.cpp.
[TestCpp] Commenting the line of loading configuration file in TestCpp.

Conflicts:
	samples/Cpp/TestCpp/Classes/AppDelegate.cpp
[iOS] Adding i386 arch for MoonWarriors.