Merge remote-tracking branch 'origin/master'

conf/requires/config.js

@@ -92,5 +92,5 @@ var oApplicationFiles = {
 
         ]
     },
-    'vitisModuleDependencies': ['vmap', 'ui.codemirror', 'ui.tinymce', 'vfb', 'ui.grid.draggable-rows' ,'ui.grid.exporter']
+    'vitisModuleDependencies': ['vmap', 'ui.codemirror', 'ui.tinymce', 'vfb', 'ui.grid.draggable-rows' ,'ui.grid.exporter', 'ui.grid.edit']
 };