renaming jsonType to className + renaming all type consts
rebuilding bridges + submodules
updating submodules
Merge branch 'classname_for_all'

* classname_for_all:
  updating submodules
  rebuilding bridges + submodules
  renaming jsonType to className + renaming all type consts
Merge branch 'master' into cocos2dx-v2

* master:
  updating submodules
  rebuilding bridges + submodules
  renaming jsonType to className + renaming all type consts

Conflicts:
	build/android/Cocos2dxAndroidCore.jar
	build/android/SoomlaAndroidCore.jar
	build/ios/libCocos2dXiOSCore.a
	build/ios/libSoomlaiOSCore.a
rebuilding libs