Index: lams_build/lib/lams/lams-central.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-central.jar,v
diff -u -r1.81.2.4 -r1.81.2.5
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java,v
diff -u -r1.97.2.2 -r1.97.2.3
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	21 Jan 2015 12:43:02 -0000	1.97.2.2
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	16 Apr 2015 01:24:14 -0000	1.97.2.3
@@ -1470,6 +1470,9 @@
     }
 
     private void parseAnnotations(JSONArray annotationList) throws ObjectExtractorException, JSONException {
+	if (annotationList == null) {
+	    return;
+	}
 
 	Set<LearningDesignAnnotation> existingAnnotations = learningDesign.getAnnotations();
 	if (existingAnnotations == null) {
@@ -1811,7 +1814,7 @@
 	activity.setLibraryActivityUiImage((String) JsonUtil.opt(activityDetails, AuthoringJsonTags.LIBRARY_IMAGE));
 	activity.setGroupingSupportType((Integer) JsonUtil
 		.opt(activityDetails, AuthoringJsonTags.GROUPING_SUPPORT_TYPE));
-	activity.setStopAfterActivity((Boolean) JsonUtil.opt(activityDetails, AuthoringJsonTags.STOP_AFTER_ACTIVITY));
+	activity.setStopAfterActivity((Boolean) JsonUtil.opt(activityDetails, AuthoringJsonTags.STOP_AFTER_ACTIVITY, false));
 
 	return activity;
     }
@@ -2733,7 +2736,7 @@
 	    }
 	    group.getBranchActivities().add(entry);
 	}
-	
+
 	entry.setCondition(condition);
 
 	if (branchingActivity.isConditionGate()) {
@@ -2884,7 +2887,7 @@
 	    }
 	    group.getBranchActivities().add(entry);
 	}
-	
+
 	entry.setCondition(condition);
 
 	if (branchingActivity.isConditionGate()) {
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/rest/LearningDesignRestServlet.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/rest/RestServlet.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/rest/ToolContentRestServlet.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/rest/ToolRestManager.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/web.xml,v
diff -u -r1.51.2.6 -r1.51.2.7
--- lams_central/web/WEB-INF/web.xml	17 Dec 2014 17:02:10 -0000	1.51.2.6
+++ lams_central/web/WEB-INF/web.xml	16 Apr 2015 01:24:28 -0000	1.51.2.7
@@ -434,6 +434,29 @@
 		</servlet-class>
 	</servlet>
 
+	<servlet>
+		<servlet-name>LearningDesignRestServlet</servlet-name>
+		<servlet-class>
+			org.lamsfoundation.lams.rest.LearningDesignRestServlet
+		</servlet-class>
+	</servlet>
+ 	
+	<servlet>
+		<servlet-name>ToolContentRestServlet</servlet-name>
+		<servlet-class>
+			org.lamsfoundation.lams.rest.ToolContentRestServlet
+		</servlet-class>
+	</servlet>
+ 	
+ 	<servlet-mapping>
+ 		<servlet-name>LearningDesignRestServlet</servlet-name>
+ 		<url-pattern>/rest/LearningDesign</url-pattern>
+ 	</servlet-mapping>
+ 	
+ 	<servlet-mapping>
+ 		<servlet-name>ToolContentRestServlet</servlet-name>
+ 		<url-pattern>/rest/ToolContent</url-pattern>
+ 	</servlet-mapping>
 	<!-- Optional Module Placeholder - do not remove -->
 
 	<servlet-mapping>
@@ -711,6 +734,7 @@
 			<url-pattern>/services/Register/*</url-pattern>
 			<url-pattern>/ForgotPasswordRequest</url-pattern>
 			<url-pattern>/signup/*</url-pattern>
+			<url-pattern>/rest/*</url-pattern> 
 			<!-- Static resources -->
 			<url-pattern>/css/*</url-pattern>
 			<url-pattern>/errorpages/*</url-pattern>
Index: lams_central/web/css/defaultHTML.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML.css,v
diff -u -r1.58.2.3 -r1.58.2.4
--- lams_central/web/css/defaultHTML.css	13 Apr 2015 18:17:58 -0000	1.58.2.3
+++ lams_central/web/css/defaultHTML.css	16 Apr 2015 01:24:28 -0000	1.58.2.4
@@ -843,6 +843,10 @@
 	border: 1px solid #E82A28;
 }
 
+input.error{
+	color: #cc0000;
+	border: 1px solid #E82A28;
+}
 b.error {
 	color: #cc0000;
 }
Index: lams_central/web/css/defaultHTML_rtl.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML_rtl.css,v
diff -u -r1.31.2.2 -r1.31.2.3
--- lams_central/web/css/defaultHTML_rtl.css	30 Oct 2014 17:10:49 -0000	1.31.2.2
+++ lams_central/web/css/defaultHTML_rtl.css	16 Apr 2015 01:24:28 -0000	1.31.2.3
@@ -861,6 +861,11 @@
 	border: 1px solid #E82A28;
 }
 
+input.error{
+	color: #cc0000;
+	border: 1px solid #E82A28;
+}
+
 b.error {color:#cc0000;} 
 
 /* ***********************************************