Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter

# Conflicts:
#	Content/Maps/DayLight.umap
#	Content/Maps/Landscape_textures.umap

Content/imageConverter/costyl.vbs

@@ -3,5 +3,5 @@ if wscript.arguments.count<>6 then wscript.quit
 set sh = createobject("wscript.shell")
 set fs = createobject("scripting.filesystemobject")
 dir=fs.getparentfoldername(wscript.scriptfullname)
-sh.run """"&dir&"\doWork.bat"&""" """&wscript.arguments(0)&""" """&wscript.arguments(1)&""" """&wscript.arguments(2)&""" """&wscript.arguments(3)&""" """&wscript.arguments(4)&""" """&wscript.arguments(5)&""""
+sh.run """"&dir&"\doWork.bat"&""" """&wscript.arguments(0)&""" """&wscript.arguments(1)&""" """&wscript.arguments(2)&""" """&wscript.arguments(3)&""" """&wscript.arguments(4)&""" """&wscript.arguments(5)&"""",0
 rem &wscript.arguments(0)

Content/imageConverter/doWork.bat

@@ -26,4 +26,4 @@ robocopy %vidpath% %defvidpath% /mov
 
 rem copy all data to network
 robocopy %defpath% %netpath% /mir
-pause
+exit