Save and Load.
Merge.
Merging again.
Merge branch 'master' of
ssh://git@github.com/pkvenkat/WorkflowTracker.git

Conflicts:
	org.cishell.reference.gui.workflow/src/org/cishell/reference/gui/workflow/model/NormalWorkflow.java
	org.cishell.reference.gui.workflow/src/org/cishell/reference/gui/workflow/views/WorkflowView.java