Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
===================================================================
diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r8f4e7af7805aec9d74d7a47f83525beebd0c1816
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java	(.../BranchingActivity.java)	(revision 47043f84205046a23497bf8c57060e2dcadf0c9a)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java	(.../BranchingActivity.java)	(revision 8f4e7af7805aec9d74d7a47f83525beebd0c1816)
@@ -31,6 +31,7 @@
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.MappedSuperclass;
 
 import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO;
 import org.lamsfoundation.lams.learningdesign.strategy.BranchingActivityStrategy;
@@ -40,6 +41,7 @@
 /**
  * @author Mitchell Seaton
  */
+@MappedSuperclass
 abstract public class BranchingActivity extends ComplexActivity implements Serializable, ISystemToolActivity {
 
     private static final long serialVersionUID = -7920442950752010105L;