Merge branch 'mchinensedit'
Merge remote-tracking branch 'upstream/master'
Add reflection in plugin on android.
Refactor the implementation of plugin protocols on android.
Update CCEditBoxImplIOS.mm

https://github.com/sunxiaoyu/cocos2d-x/commit/02c664730669c7e3d5d0ecc727deab9aa785c2c7
correct the library path
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 #2224 : Modify the implementation of plugin flurry & umeng.
issue #2224 : Use variable argument functions in the implementation of reflection.
issue #2224 : Implement reflection in plugin on iOS.
issue #2224 : Modify the implementation of plugin flurry & umeng on iOS for the new framework.
Merge branch 'ForReflection' into develop

Conflicts:
	plugin/protocols/platform/ios/PluginUtilsIOS.mm
KeyboardDispatcher + tests for it on linux
added vim .swo file
fixed typo that return value was ignored
fixed #1647: Adding WebSocket support for Cpp and JSB.
fixed #1647: Adding missing files.
fixed #1647: Updating JS-test.