issue #2161: android supports ETC format now
issue #2161: make linux,marmalade,native client,mac and emscripten project to include CCTextureETC.cpp
issue #2161:add CCTextureETC.cpp/.h into vs2010 project
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support
issue #2161: resolve conflict
Merge pull request #2655 from minggo/ETC1-support

Support ETC1 format on Android
modify ORGANIZATIONNAME
Merge pull request #2660 from minggo/ETC1-support

modify ORGANIZATIONNAME
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #2662 from CocosRobot/updategeneratedsubmodule_1369737138

[AUTO] : updating submodule reference to latest autogenerated bindings
CCConfiguration has format

CCconfiguration has a file format.
It has a data and metadata
Merge pull request #2667 from ricardoquesada/configuration_format_2

CCConfiguration has format