Merge branch 'fallguy/feature/moai-2.0' into develop

Conflicts:
	.gitmodules
	android-ndk/jni/src/jni.cpp
	android-studio/app/src/main/res/drawable-hdpi/ic_launcher.png
	android-studio/app/src/main/res/drawable-mdpi/ic_launcher.png
	android-studio/app/src/main/res/drawable-xhdpi/ic_launcher.png
	android-studio/app/src/main/res/drawable-xxhdpi/ic_launcher.png
	android-studio/gradlew.bat
	ant/libmoai/jni/Android.mk
	src/custom-include/curl/linux/curl_config.h
	src/host-sdl/SDLHost.cpp
	src/moai-core/MOAILuaRuntime.h
	src/moai-ios/MOAIBillingIOS.h
	src/moai-sim/MOAICameraFitter2D.cpp
	src/moai-sim/MOAICollisionWorld.cpp
	src/moai-sim/MOAIGfxMgr.cpp
	src/moai-sim/MOAIGfxStateCache.cpp
	src/moai-sim/MOAIGraphicsProp.cpp
	src/moai-sim/MOAILayer.cpp
	src/moai-sim/MOAISingleTexture.cpp
	src/moai-sim/MOAITextLabel.cpp
	src/moai-util/MOAILuaUtil.cpp
	util/ant-libmoai/Android.mk
	util/ant-libmoai/MoaiTarget.mk
	util/ant-libmoai/config.lua
	util/ant-libmoai/main.lua
	util/ant-libmoai/modules/3rdparty-curl.mk
	util/ant-libmoai/modules/moai-http-client.mk
	util/ant-libmoai/modules/moai-luaext.mk
	vs2015/moai-exe/moai.vcxproj
	vs2015/moai.sln
	vs2015/zl-lib-core/zl-lib-core.vcxproj
	vs2015/zl-lib-core/zl-lib-core.vcxproj.filters
	xcode/ios/moai-ios.xcodeproj/project.pbxproj
	xcode/libmoai/libmoai.xcodeproj/project.pbxproj
	xcode/libmoai/libmoai.xcodeproj/xcshareddata/xcschemes/libmoai-ios-all.xcscheme
	xcode/libmoai/libmoai.xcodeproj/xcshareddata/xcschemes/libmoai-osx-all.xcscheme
	xcode/osx/moai-osx.xcodeproj/project.pbxproj
	xcode/osx/moai-osx.xcodeproj/xcshareddata/xcschemes/moai-osx.xcscheme
	xcode/resources/Images.xcassets/AppIcon.appiconset/Contents.json

.gitignore

@@ -49,4 +49,3 @@ docs/api-reference
 env.sh
 sample-browser/
 util/build-sample-browser/temprom/
-moai-osx-static.xcscmblueprint

.gitmodules

@@ -4,9 +4,18 @@
 [submodule "3rdparty/kissfft"]
 	path = 3rdparty/kissfft
 	url = https://github.com/itdaniher/kissfft.git
-[submodule "3rdparty/mbedtls"]
-	path = 3rdparty/mbedtls
-	url = https://github.com/ARMmbed/mbedtls.git
-[submodule "3rdparty/curl"]
-	path = 3rdparty/curl
-	url = https://github.com/curl/curl
+[submodule "3rdparty/assimp"]
+	path = 3rdparty/assimp
+	url = https://github.com/assimp/assimp.git
+[submodule "3rdparty/TGAReader"]
+	path = 3rdparty/TGAReader
+	url = https://github.com/npedotnet/TGAReader.git
+[submodule "3rdparty/google-test"]
+	path = 3rdparty/google-test
+	url = https://github.com/google/googletest.git
+[submodule "3rdparty/gvr-ios-sdk"]
+	path = 3rdparty/gvr-ios-sdk
+	url = https://github.com/moai/gvr-ios-sdk.git
+[submodule "3rdparty/artoolkit5"]
+	path = 3rdparty/artoolkit5
+	url = https://github.com/artoolkit/artoolkit5.git