Merge branch 'master' into WebGUI8. Merged up to 7.10.4

lib/WebGUI/Workflow/Activity.pm

@@ -76,6 +76,22 @@ These methods are available from this class:
 
 #-------------------------------------------------------------------
 
+=head2 cleanup ( )
+
+Override this activity to add a cleanup routine to be run if an instance
+is deleted with this activity currently in a waiting state.  This is a stub
+and will do nothing unless overridden.
+
+=cut
+
+sub cleanup {
+	my $self     = shift;
+	my $instance = shift;
+	return 1;
+}
+
+#-------------------------------------------------------------------
+
 =head2 create ( session, workflowId [, id, classname  ] )
 
 Creates a new instance of this activity in a workflow.