Solving 'black screen' on android
fixing Linux build
Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes

Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
closed #2410: Formatting codes in Texture2D::initWithString.
Add JSFunctionWrapper in preparation for bindings-generator changes.
Some more changes to make the code more c++ friendly:

- nodeToParentTransform -> getNodeToParentTransform() (the same for its friends)
   - Deprecates the old methods
   - adds 'consts' to those methods
- boundingBox() -> getBoundingBox()
   - the new one is const
   - Deprecates the old method.
- Adds overrides keywords in CCNodeRGBA and CCArmature
- AffineMatrix are mutables
issue #2410: [Android] Adding listener for CCDrawNode when application resume from background.
Reset the order of reloading shaders and textures in main.cpp.
closed #2410: Fixing a bug that loading a wrong texture in ShaderCache::loadDefaultShaders. This could fix DrawNode displays nothing when resume.
issue #2410: Reverting some changes about VAO.  And adding CC_ENABLE_CACHE_TEXTURE_DATA to 'EVNET_COME_TO_FOREGROUND' in DrawNode.
issue #2410: [Reverting] Don't use 'ccGLEnableVertexAttribs' when using VAO, use 'glEnableVertexAttribArray' instead.
Merge pull request #3166 from dumganhar/iss2410-blackscreen-android

Merge PR https://github.com/cocos2d/cocos2d-x/pull/3117
Update AUTHORS [ci skip]
issue #2407: Adds more readability to the class internals for 'ParallaxNode'.
issue #2407: Removing unused codes in Box2dTest.h
issue #2407: Updating SpriteTest.cpp, Don't hide virtual override function.
[ci skip]Update cocos2dx.ini, don't genergate bindings for DrawNode::listenBackToForeground.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2407-class-order
Merge pull request #3174 from dumganhar/iss2407-class-order

issue 2407: Adds more readability to the class internals for 'ParallaxNode'.
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3175 from CocosRobot/updategeneratedsubmodule_1374044026

[AUTO] : updating submodule reference to latest autogenerated bindings