Merge branch 'dev' into dev7

config/_file_loader.lua

@@ -93,6 +93,7 @@ return {
     'modules.gui.vlayer',
     'modules.gui.research',
     'modules.gui.module',
+    'modules.gui.surveillance',
 		'modules.graftorio.require', -- graftorio
 
     --- Config Files

config/expcore/roles.lua

@@ -233,6 +233,7 @@ Roles.new_role('Member','Mem')
     'command/waterfill',
     'command/clear-item-on-ground',
     'command/clear-blueprint'
+    'gui/surveillance'
 }
 
 local hours3, hours15 = 3*216000, 15*60

config/module.lua

@@ -1,6 +1,6 @@
 return {
     -- type of machine to handle together
-    default_module_row_count = 4,
+    default_module_row_count = 6,
     module_slot_max = 4,
     machine_prod_disallow = {
         ['beacon'] = true