updating submodules
Merge branch 'master' into cocos2dx-v2

* master:
  updating submodules

Conflicts:
	build/android/AndroidStore.jar
	build/ios/libSoomlaiOSStore.a