Merge branch 'master' of http://192.168.5.71:3333/WOSO_H5_01Team/GunfightShoot

# Conflicts:
#	profiles/v2/packages/reference-image.json

profiles/v2/packages/reference-image.json

@@ -3,10 +3,14 @@
   "config": {
     "images": [],
     "sceneUUID": {},
+<<<<<<< HEAD
 <<<<<<< HEAD
     "scene": "10795865-5525-41fc-8bf7-0e8d6983b214"
 =======
     "scene": "3f3694fe-a89c-4f5e-9618-89fea881f25a"
 >>>>>>> 15c6bc3 (111)
+=======
+    "scene": "3f3694fe-a89c-4f5e-9618-89fea881f25a"
+>>>>>>> 15c6bc30cbe36ad8e4970d1fd85e64d2639697c0
   }
 }