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.
[iOS] Adding i386 arch for MoonWarriors.
Merge pull request #2842 from dumganhar/develop

[Android] Don't use c++11 feature in OpenSLEngine.cpp. [iOS] Adding i386 arch for MoonWarriors.
Crash fix in CCControlColurPickerTest.
Merge pull request #2844 from dumganhar/develop

Crash fix in CCControlColurPickerTest.
Add plugin twitter for iOS.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	plugin/samples/HelloSocial/proj.ios/HelloSocial.xcodeproj/project.pbxproj
Add C++ 11 support for iOS projects.
Resolve the bug in the reflection of plugin.
Modify the license of plugin twitter.
Delete the developer ID in project config.
Merge pull request #2847 from natural-law/develop

Add twitter plugin for iOS