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
Add texture2D convert test and fix the convert bugs
Merge CCImageCommonWebp.cpp into CCImageCommon_cpp.h
edit for linux
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag
fix some compile error and pass the linux compile
fix the travis ci compile error
fix the travis ci compile error
[Tizen] Fix compile error.
Merge pull request #3328 from natural-law/develop

Add plugin flurry ads
Merge pull request #3329 from pyrasis/tizen_2.2

[Tizen] Fix compile error