Index: lams_central/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r8fd679dd28d13f8ccabe44c5a74c7873806f486b -r471b903caa3365758fbdec0a22440b1b0b3f2947
--- lams_central/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 8fd679dd28d13f8ccabe44c5a74c7873806f486b)
+++ lams_central/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 471b903caa3365758fbdec0a22440b1b0b3f2947)
@@ -55,7 +55,6 @@
 	<form-property name="email" type="java.lang.String" />
 	<form-property name="localeId" type="java.lang.Integer" />
 	<form-property name="timeZone" type="java.lang.String" />
-	<form-property name="tutorialsDisabled" type="java.lang.Boolean" />
 	<form-property name="userTheme" type="java.lang.Long" />
 </form-bean>
 
@@ -66,6 +65,7 @@
 	<form-property name="firstName" type="java.lang.String" />
 	<form-property name="lastName" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
+	<form-property name="country" type="java.lang.String" />
 	<form-property name="confirmEmail" type="java.lang.String" />
 	<form-property name="courseKey" type="java.lang.String" />
 	<form-property name="submitted" type="java.lang.Boolean" />
@@ -133,6 +133,11 @@
         redirect="false"
       />
       <forward
+        name="policyConsents"
+        path="/policyConsents.do"
+        redirect="false"
+      />
+      <forward
         name="portrait"
         path="/portrait.do"
         redirect="false"
@@ -189,6 +194,12 @@
         path="/admin/usersearch.do"
         redirect="false"
       />
+      <forward
+        name="error"
+        path="/errorpages/errorWithMessage.jsp"
+        redirect="false"
+      />
+
     </action>
     <action
       path="/Paint"
@@ -258,6 +269,16 @@
         redirect="false"
       />
       <forward
+        name="emailVerify"
+        path="/signup/emailVerify.jsp"
+        redirect="false"
+      />
+      <forward
+        name="emailVerifyResult"
+        path="/signup/emailVerifyResult.jsp"
+        redirect="false"
+      />
+      <forward
         name="success"
         path=".successfulSignup"
         redirect="false"
@@ -363,7 +384,30 @@
         redirect="false"
       />
     </action>
+    
+	<!--
+		Learning Design Sequence Templates
+  		-->
     <action
+      path="/authoring/template/tbl"
+      type="org.lamsfoundation.lams.authoring.template.web.TBLTemplateAction"
+      parameter="method"
+      validate="false"
+      scope="request"
+    >
+    <forward name="init" path="/authoring/template/tbl/tbl.jsp" />
+    <forward name="question" path="/authoring/template/tool/mcquestion.jsp" />
+    <forward name="questionoption" path="/authoring/template/tool/mcoption.jsp" />
+    <forward name="redooption" path="/authoring/template/tool/mcredooption.jsp" />
+    <forward name="assess" path="/authoring/template/tool/assessment.jsp" />
+    <forward name="assessmcq" path="/authoring/template/tool/assessmcq.jsp" />
+    <forward name="assessredooption" path="/authoring/template/tool/assessredooption.jsp" />
+    <forward name="assessoption" path="/authoring/template/tool/assessoption.jsp" />
+    <forward name="peerreviewstar" path="/authoring/template/tool/peerreviewstar.jsp" />
+    </action>
+
+
+    <action
       path="/portrait"
       type="org.lamsfoundation.lams.web.PortraitAction"
       name="PortraitActionForm"
@@ -373,7 +417,7 @@
     >
       <forward
         name="portrait"
-        path="/portrait.jsp"
+        path="/profile/portrait.jsp"
         redirect="false"
       />
     </action>
@@ -410,7 +454,7 @@
       type="org.lamsfoundation.lams.web.ProfileSaveAction"
       name="UserForm"
       scope="request"
-      input="/editprofile.jsp"
+      input="/profile/editprofile.jsp"
       unknown="false"
       validate="false"
     >
@@ -436,17 +480,27 @@
     >
       <forward
         name="view"
-        path="/profile.jsp"
+        path="/profile/profile.jsp"
         redirect="false"
       />
       <forward
         name="lessons"
-        path="/lessons.jsp"
+        path="/profile/lessons.jsp"
         redirect="false"
       />
       <forward
+        name="profilePolicyConsents"
+        path="/profile/profilePolicyConsents.jsp"
+        redirect="false"
+      />
+      <forward
+        name="policyDetails"
+        path="/profile/policyDetails.jsp"
+        redirect="false"
+      />
+      <forward
         name="edit"
-        path="/editprofile.jsp"
+        path="/profile/editprofile.jsp"
         redirect="false"
       />
     </action>
@@ -468,7 +522,7 @@
       type="org.lamsfoundation.lams.web.PortraitSaveAction"
       name="PortraitActionForm"
       scope="request"
-      input="/portrait.jsp"
+      input="/profile/portrait.jsp"
       parameter="method"
       unknown="false"
       validate="false"
@@ -526,14 +580,6 @@
         redirect="false"
       />
     </action>
-    <action
-      path="/tutorial"
-      type="org.lamsfoundation.lams.web.TutorialAction"
-      parameter="method"
-      unknown="false"
-      validate="true"
-    >
-    </action>
     
     <action
       path="/twoFactorAuthentication"
@@ -547,8 +593,28 @@
         path="/twoFactorAuthSecret.jsp"
         redirect="false"
       />
-    </action>    
+    </action>   
+
     <action
+      path="/policyConsents"
+      type="org.lamsfoundation.lams.web.action.PolicyConsentsAction"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="policyConsents"
+        path="/policyConsents.jsp"
+        redirect="false"
+      />
+      <forward
+        name="index"
+        path="/index.do"
+        redirect="true"
+      />
+    </action> 
+     
+    <action
       path="/passwordChanged"
       type="org.lamsfoundation.lams.web.PasswordChangeAction"
       name="PasswordChangeActionForm"