refactor CCImage and CCTexture2D
Merge https://github.com/cocos2d/cocos2d-x into 2345
Refactor CCTexture2D and CCImage
roll back the android project setting
delete the file added by misstake.
Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR
Combine CCTextureETC to CCImage and CCTexture2D.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
edit for lua
issue #2437: Fix Bug RenderTextureTestDepthStencil not clipped by stencil
close #2437: replace stencil mechanism with a new approach by removing glColorMask call
Merge pull request #3318 from dabingnn/Iss2437-RenderTextureStencilTest-Bug

Iss2437 render texture stencil test bug
Merge pull request #3321 from dumganhar/develop

[emscripten] Fixing compilation errors.
added emscripten keyboard support
Re-use SAFE_HEAP option in emscripten.
Add texture2D convert test and fix the convert bugs
Merge CCImageCommonWebp.cpp into CCImageCommon_cpp.h
Move the developer informations to file Configs.h
issue #2439, Add flurry ads plugin for iOS.