[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.
add plugins google apple and facebook plugins
Merge branch 'develop' of https://github.com/cocos2d-x/plugin-x into develop
merge develop into master
JAVAVM is null will crash...
Merge pull request #11 from liang8305/javavm_null_point

JAVAVM is null will crash and is hard to debug
Android IAP added to plugin-x and AUTHORS
Merge pull request #12 from martell/androidiap

Android IAP added to plugin-x and AUTHORS
Update the code of JS samples for the new version of engine.
Merge pull request #14 from natural-law/develop

Update the code of JS samples for the new version of engine.
merge in changes from revision released with cocos2d-x-3.0beta2 get everything compiling again
Merge branch 'master' into develop