[2.1.5] Fixing a typo: EVNET_ --> EVENT_
[2.1.5] Re-order of recovering GL status in jni/xxx/main.cpp.
Update the configuration files of JS Binding in plugin.
Merge pull request #2 from natural-law/master

Update the configuration files of JS Binding in plugin.
Remove JS binding & samples of plugins.
Solve the error during ndk-build when ndk version is r9b & later.
Merge pull request #19 from natural-law/master

Update the plugin protocols code & samples.
add (add|get)EventListener and deprecate old functions
fix indentation
change s|getter to inline function
Merge branch 'jsb_modify' of https://github.com/joshuastray/plugin-x into jsb_modify
add deprecated macro
Merge branch 'jsb_modify' of https://github.com/joshuastray/plugin-x into jsb_modify
Update bindings
Merge pull request #1 from pandamicro/jsb_modify

Update bindings
Refactor #5478: Fix function binding issue with enum type
fix binding bug
Merge branch 'jsb_modify' of https://github.com/joshuastray/plugin-x into jsb_modify

Conflicts:
	protocols/include/ProtocolUser.h
Refactor #5478: Update bindings for new function definition
Merge pull request #2 from pandamicro/jsb_modify

Refactor #5478: Update bindings for new function definition