Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -ra93d8d1f7b86194a155d41c34874fc83acada0c9 -ra4cf9fbd9a4f01cabcc043000dc07c082df8a434
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
===================================================================
diff -u -r250486f86b66ac04cece0001879c3dc39c96ed98 -ra4cf9fbd9a4f01cabcc043000dc07c082df8a434
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java	(.../OptionsActivity.java)	(revision 250486f86b66ac04cece0001879c3dc39c96ed98)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java	(.../OptionsActivity.java)	(revision a4cf9fbd9a4f01cabcc043000dc07c082df8a434)
@@ -170,7 +170,7 @@
      * value is null in the database, returns 0
      */
     public Integer getMinNumberOfOptionsNotNull() {
-    	return maxNumberOfOptions!=null ? maxNumberOfOptions : new Integer(0);
+    	return minNumberOfOptions!=null ? minNumberOfOptions : new Integer(0);
     }
 
     public void setMinNumberOfOptions(Integer minNumberOfOptions) {
Index: lams_learning/conf/language/ApplicationResources.properties
===================================================================
diff -u -r60052e823315f4d012bca10e57a8e24143a8b198 -ra4cf9fbd9a4f01cabcc043000dc07c082df8a434
--- lams_learning/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 60052e823315f4d012bca10e57a8e24143a8b198)
+++ lams_learning/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a4cf9fbd9a4f01cabcc043000dc07c082df8a434)
@@ -21,7 +21,7 @@
 message.activity.parallel.partialComplete  =You have to complete the other task before progressing to the next activity....
 message.activity.parallel.noFrames  =Your browser does not handle frames!
 message.activity.options.noActivitySelected  =Please select an activity from the list
-message.activity.options.activityCount  =You must complete at least {0} of these {1} activities.
+message.activity.options.activityCount  =You must complete at least {0} out of {1} activities to finish.
 message.activity.options.note  =<u><b>Note</b></u>: Once you finish any of the above activities you can revisit them by using the progress bar on the left.
 label.activity.options.choose  =Choose
 label.synch.gate.title  =Synch Gate