Merge branch 'mchinensedit'
Merge remote-tracking branch 'upstream/master'
Disable debugging symbols for all Emscripten builds. -g is simply too slow to be a useful debugging tool. If someone needs it they should add it back in, but it is not sensible default behavior at this point.
Add reflection in plugin on android.
Fixed linebreaks on Mac OSX
Merge pull request #2627 from samuele3hu/issue2103_testlua

add more test lua
Merge pull request #2631 from samuele3hu/issue2103_testlua

Add some skip function name to tools/tojs/cocos2dx_extension.ini
Merge pull request #2635 from samuele3hu/issue2103_testlua

modify some skip function name to tools/tojs/cocos2dx_extenson.ini
Update generate-jsbindings.sh [ci skip], send pull request to the branch which is being built.
Refactor the implementation of plugin protocols on android.
Update CCEditBoxImplIOS.mm

https://github.com/sunxiaoyu/cocos2d-x/commit/02c664730669c7e3d5d0ecc727deab9aa785c2c7
correct the library path
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.
OnEnterTransitionDidFinish was called twice when a node is added in onEnter

Fix ported from cocos2d-iphone:
https://github.com/cocos2d/cocos2d-iphone/commit/99b7bef8800bd850f6b0c7dc1eb09d8e81fd80f7
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 pull request #2655 from minggo/ETC1-support

Support ETC1 format on Android