fix direct delete touch object without use release crash bug;
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
use Configuration::getInstance()->supportsShareableVAO() in place of CC_TEXTURE_ATLAS_USE_VAO;
fix GL_EXT_discard_framebuffer always disable in EAGLView.mm;
fix GL_EXT_discard_framebuffer always disable in EAGLView.mm (fix compile fail on early iOS SDK 4.0);
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/bmanGH/cocos2d-x into develop

Conflicts:
	cocos2dx/CCConfiguration.cpp
	cocos2dx/draw_nodes/CCDrawNode.cpp
	cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	cocos2dx/platform/android/CCEGLView.cpp
	cocos2dx/textures/CCTextureAtlas.cpp
	cocos2dx/textures/CCTextureAtlas.h
Merge branch 'develop' of https://github.com/bmanGH/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge remote-tracking branch 'upstream/develop' into develop
add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed in GLProgram class.
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	cocos/scripting/auto-generated
	tools/bindings-generator
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos/2d/CCConfiguration.cpp
	cocos/2d/CCDrawNode.cpp
	cocos/2d/CCParticleSystemQuad.cpp
	cocos/2d/CCTextureAtlas.cpp
	cocos/2d/ccGLStateCache.cpp
	cocos/2d/platform/ios/EAGLView.mm
	cocos/scripting/auto-generated
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos/scripting/auto-generated
	tools/bindings-generator
Cancel the onSubThreadEnded callback,because _ws may be deleted in the onClose callback.
Merge commit 'f41a7a9bee1d0a61228fd2208ed0d7ba0588e9ce' into develop

Conflicts:
	cocos/scripting/auto-generated
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos/scripting/auto-generated
	tools/bindings-generator