Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
===================================================================
diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -r167664023c2c3e8a1a219b349a6a1f28737c25c6
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java	(.../GroupingActivity.java)	(revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java	(.../GroupingActivity.java)	(revision 167664023c2c3e8a1a219b349a6a1f28737c25c6)
@@ -56,7 +56,7 @@
     private Integer createGroupingUIID;
 
     /** The grouping that this activity creates */
-    @OneToOne(fetch = FetchType.LAZY, optional = false)
+    @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "create_grouping_id")
     public Grouping createGrouping;
 
@@ -91,17 +91,10 @@
 	return new ToStringBuilder(this).append("activityId", getActivityId()).toString();
     }
 
-    /**
-     * @return Returns the createGrouping.
-     */
     public Grouping getCreateGrouping() {
 	return createGrouping;
     }
 
-    /**
-     * @param createGrouping
-     *            The createGrouping to set.
-     */
     public void setCreateGrouping(Grouping createGrouping) {
 	this.createGrouping = createGrouping;
     }
@@ -114,9 +107,6 @@
 	this.createGroupingUIID = create_grouping_ui_id;
     }
 
-    /**
-     * @see org.lamsfoundation.lams.util.Nullable#isNull()
-     */
     @Override
     public boolean isNull() {
 	return false;