Merge pull request #2647 from dumganhar/master

Merge branch 'develop'
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
CCTextureAtlas::updateQuad modify for the memcpy hot spot

change the place that call CCTextureAtlas::updateQuad method to
update the quads with pointer reference directly.

Signed-off-by: Yongqin Liu<liuyq0307@thundersoft.com>
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
Encoding UTF-8 on Tizen CCEditBox and check empty string.
Keep a previous text on Tizen CCEditBox.
CCConfiguration has format

CCconfiguration has a file format.
It has a data and metadata
Delete ByteBuffer pointer and NULL check.
CCLabelAtlas.cpp: add check for n when call setDirty

in CCLabelAtlas::updateAtlasValues, there is the case that n equal to 0,
so we need to check it before when call m_pTextureAtlas->setDirty(true) and do
other process.

Signed-off-by: Yongqin Liu <liuyq0307@thundersoft.com>
Merge pull request #2667 from ricardoquesada/configuration_format_2

CCConfiguration has format
Add out of bound check for the index before do the update

Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
Implement setIMEKeyboardState function for Tizen.