Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2

.gitmodules

@@ -34,10 +34,6 @@
 [submodule "_Package/com.ultracombos.activity"]
 	path = _Package/com.ultracombos.activity
 	url = https://github.com/UltraCombos/com.ultracombos.activity.git
-[submodule "_Package/KlakSpout"]
-	path = _Package/KlakSpout
-	url = https://github.com/keijiro/KlakSpout
-	branch = upm
 [submodule "_Package/com.ultracombos.ultra-control"]
 	path = _Package/com.ultracombos.ultra-control
 	url = https://github.com/UltraCombos/com.ultracombos.ultra-control.git
@@ -62,3 +58,7 @@
 	path = _Package/com.newtonsoft.json
 	url = https://github.com/UltraCombos/com.newtonsoft.json.git
 	branch = master
+[submodule "_Package/KlakSpout"]
+	path = _Package/KlakSpout
+	url = https://github.com/UltraCombos/KlakSpout
+	branch = upm