Resolved merge conflicts with master

modpol_core/modules/template.lua

@@ -43,10 +43,13 @@ function module_template:initiate(result)
    -- call interaction functions here!
 
    -- concluding functions:
-   -- call these wherever process might end;
+   -- first, where appropriate, return users to dashboards.
+   -- second, result:
    -- may need to put result in self.data.result
-   --  if process ends in another function
+   -- call this when module is successful (not for abort):
    if result then result() end
+   -- third, delete the process
+   -- call this wherever process might end:
    self.org:delete_process(self.id)
 end