issue #2771:  add comments
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings
fix direct delete touch object without use release crash bug;
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);
add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed in GLProgram class.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into fix_touch_retain

Conflicts:
	cocos2dx/platform/CCEGLViewProtocol.cpp
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime

Conflicts:
	cocos2dx/CCConfiguration.cpp
	cocos2dx/draw_nodes/CCDrawNode.cpp
	cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	cocos2dx/platform/android/CCEGLView.cpp
	cocos2dx/platform/ios/EAGLView.mm
	cocos2dx/textures/CCTextureAtlas.cpp
	cocos2dx/textures/CCTextureAtlas.h
remove conflicts files;
Create NewSpriteBatchNode to use NewRender
Create new test for NewRenderer
Make sure it compiles after Change in test
Finish NewSpriteBatchTest
Merge branch 'develop' into newRenderer
Updates CODING STYLE

Adds Xcode 5.0, gcc 4.8 and VS 2012 as the supported compilers
Merge pull request #4210 from ricardoquesada/coding

Updates CODING STYLE
More fixes to CODING STYLE

Adds cocos2d-x logo, and other  syntax fixes
Merge pull request #4211 from ricardoquesada/coding_ii

More fixes to CODING STYLE
removes cocos2d-x from title since the image is already there