Merge branch 'master' of http://10.30.3.90:3001/Tianzhaohui/HeBoSuoCAVE_51

# Conflicts:
#	HeBoSuo_51.uproject

HeBoSuo_51.uproject

@@ -100,12 +100,17 @@
 			]
 		},
 		{
+<<<<<<< HEAD
 			"Name": "SteamVR",
 			"Enabled": true,
 			"SupportedTargetPlatforms": [
 				"Win64",
 				"Linux"
 			]
+=======
+			"Name": "Text3D",
+			"Enabled": true
+>>>>>>> b2f728d9235a46ad62d5e7c7de21eb82ae37a1ca
 		}
 	]
 }