Add reflection in plugin on android.
Fixed linebreaks on Mac OSX
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
Refactor the implementation of plugin protocols on android.
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 #2224 : Modify the implementation of plugin twitter & weibo on android for the new framework of plugin.
issue #2224 : Modify the implementation of plugin alipay & nd91.
issue #2224 : Modify the implementation of plugin admob.
issue #2161: android supports ETC format now
issue #2161: make linux,marmalade,native client,mac and emscripten project to include CCTextureETC.cpp