update s3tc#1
update s3tc #2
update s3tc #3 ,android test
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
update s3tc #3 ,standard of code
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	cocos2dx/Android.mk
	cocos2dx/platform/CCImage.h
	cocos2dx/platform/CCImageCommon_cpp.h
	cocos2dx/textures/CCTexture2D.h
	scripting/javascript/bindings/generated
nothing with s3tc
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
update s3tc #4 , code standardization
Reverting the changed submodules.
Removing the conflict generated files.
modify linux makefile
update s3tc #5, code standardization
update s3tc #6
update s3tc #7
update s3tc#8,resolve CCConfiguration conflict
Merge pull request #3397 from godyZ/develop

S3tc compressed texture support