Merge pull request #2626 from samuele3hu/issue2103_testlua

Add more Test Lua
Merge pull request #2630 from samuele3hu/issue2103_testlua

Add some skip function name to tools/tojs/cocos2dx_extension.ini
Update generate-jsbindings.sh [ci skip], send pull request to the branch which is being built.
Merge pull request #2634 from samuele3hu/issue2103_testlua

modify some skip function name to tools/tojs/cocos2dx_extenson.ini
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #2637 from CocosRobot/updategeneratedsubmodule_1369387859

[AUTO] : updating submodule reference to latest autogenerated bindings
Linux port: added libX11 to linked libraries.

Otherwise build fails on linux.
Implement CCEditBox for Tizen. (develop branch)
Merge pull request #2643 from pyrasis/tizen_2.1

Implement CCEditBox for Tizen.
Merge pull request #2641 from sergey-shambir/fix_linux_linkage

Linux port: added libX11 to linked libraries.
Merge branch 'develop'
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