[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.
Wrapper Class to GooglePlayService plugin for ios.
Fix, onActivityResult response
fix, reconnecting issue
disable debug feature
fix, long to jlong in JNI
update GooglePlayService plugin
fixed Ads Propertes value
modify inline function of getAdsInfo
remove old code
Merge branch 'master' of https://github.com/cocos2d-x/plugin-x into working

Conflicts:
	plugins/GooglePlayService/proj.android/.project
	plugins/googleplay/proj.android/.project
	plugins/googleplay/proj.android/project.properties
	plugins/qh360/proj.android/build.xml
	plugins/uc/proj.android/project.properties
	protocols/platform/ios/InterfaceGoogle.h
	samples/HelloAds/proj.android/jni/hellocpp/main.cpp
	samples/HelloAnalytics/proj.android/jni/hellocpp/main.cpp
	samples/HelloIAP/proj.android/jni/hellocpp/main.cpp
	samples/HelloPlugins/Resources/BtnAlipay.png
	samples/HelloPlugins/Resources/BtnND91.png
	samples/HelloPlugins/Resources/CloseNormal.png
	samples/HelloPlugins/Resources/CloseSelected.png
	samples/HelloPlugins/proj.android/proguard-project.txt
	samples/HelloSocial/proj.android/jni/hellocpp/main.cpp
fixed destroy bug