diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_gradebook_report.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_gradebook_report.tmpl
new file mode 100644
index 000000000..fc15940e6
--- /dev/null
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_gradebook_report.tmpl
@@ -0,0 +1,46 @@
+#PBtmpl0000000000000062
+<h2><tmpl_var title></h2>
+
+<tmpl_if user.canViewReports>
+<table cellspacing="2" cellpadding="1" style="border:solid silver 1px;">
+<tr>
+	<td colspan="4">
+		<table width="100%" cellspacing="2" cellpadding="1">
+		<tr>
+			<td style="width:33%;text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var report.gradebook.url>"><tmpl_var report.gradebook.label></a></td>
+			<td style="width:33%;text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var report.overview.url>"><tmpl_var report.overview.label></a></td>
+			<td style="width:33%;text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var delete.all.responses.url>"><tmpl_var delete.all.responses.label></a></td>
+		</tr>
+		</table>
+	</td>
+</tr>
+<tr>
+	<td style="text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var export.answers.url>"><tmpl_var export.answers.label></a></td>
+	<td style="text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var export.questions.url>"><tmpl_var export.questions.label></a></td>
+	<td style="text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var export.responses.url>"><tmpl_var export.responses.label></a></td>
+	<td style="text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var export.composite.url>"><tmpl_var export.composite.label></a></td>
+</tr>
+</table> 
+</tmpl_if>
+
+<br /> <br />
+
+<table class="tableData">
+<tr class="tableHeader"><td style="width:60%"><tmpl_var response.user.label></td>
+                <td style="width:20%"><tmpl_var response.count.label></td>
+                <td style="width:20%"><tmpl_var response.percent.label></td></tr>
+<tmpl_loop response_loop>
+<tr>
+	<td><a href="<tmpl_var response.url>"><tmpl_var response.user.name></a></td>
+	<td><tmpl_var response.count.correct>/<tmpl_var question.count></td>
+             <td><tmpl_var response.percent>%</td>
+</tr>
+</tmpl_loop>
+</table>
+
+
+<tmpl_if pagination.pageCount.isMultiple>
+  <div class="pagination">
+    <tmpl_var pagination.previousPage>  &middot; <tmpl_var pagination.pageList.upTo20> &middot; <tmpl_var pagination.nextPage>
+  </div>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_grouped_aggregate_feeds.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_grouped_aggregate_feeds.tmpl
new file mode 100644
index 000000000..1c11c6696
--- /dev/null
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_grouped_aggregate_feeds.tmpl
@@ -0,0 +1,56 @@
+#DPUROtmpl0000000000001
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<p>
+<a href="<tmpl_var rss.url.0.9>">RSS 0.90</a>
+<a href="<tmpl_var rss.url.0.91>">RSS 0.91</a>
+<a href="<tmpl_var rss.url.1.0>">RSS 1.0</a>
+<a href="<tmpl_var rss.url.2.0>">RSS 2.0</a>
+</p>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+	<p />
+</tmpl_if>
+
+<h2>
+<tmpl_if channel.link>
+	<a href="<tmpl_var channel.link>" target="_blank"><tmpl_var channel.title></a>
+<tmpl_else>
+	<tmpl_var channel.title>
+</tmpl_if>
+</h2>
+
+<tmpl_if channel.description>
+	<tmpl_var channel.description><p />
+</tmpl_if>
+
+<ul>
+<tmpl_loop item_loop>
+
+<tmpl_if new_rss_site>
+<!-- We're in a new RSS group. Output the header. -->
+<h2><a href="<tmpl_var site_link>" target="_blank"><tmpl_var site_title></a></h2>
+</tmpl_if>
+
+<li>
+	<tmpl_if link>
+		<a href="<tmpl_var link>"><tmpl_var title></a>
+	<tmpl_else>
+		<tmpl_var title>
+	</tmpl_if>
+	<tmpl_if description>
+		- <tmpl_var description>
+	</tmpl_if>
+<b><tmpl_var site_title></b>
+</li>
+</tmpl_loop>
+</ul>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_overview_report.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_overview_report.tmpl
new file mode 100644
index 000000000..db9c890fb
--- /dev/null
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_overview_report.tmpl
@@ -0,0 +1,93 @@
+#PBtmpl0000000000000063
+
+<h2><tmpl_var title></h2>
+
+<tmpl_if user.canViewReports>
+<table cellspacing="2" cellpadding="1" style="border:solid silver 1px;">
+<tr>
+	<td colspan="4">
+		<table width="100%" cellspacing="2" cellpadding="1">
+		<tr>
+			<td style="width:33%;text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var report.gradebook.url>"><tmpl_var report.gradebook.label></a></td>
+			<td style="width:33%;text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var report.overview.url>"><tmpl_var report.overview.label></a></td>
+			<td style="width:33%;text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var delete.all.responses.url>"><tmpl_var delete.all.responses.label></a></td>
+		</tr>
+		</table>
+	</td>
+</tr>
+<tr>
+	<td style="text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var export.answers.url>"><tmpl_var export.answers.label></a></td>
+	<td style="text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var export.questions.url>"><tmpl_var export.questions.label></a></td>
+	<td style="text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var export.responses.url>"><tmpl_var export.responses.label></a></td>
+	<td style="text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var export.composite.url>"><tmpl_var export.composite.label></a></td>
+</tr>
+</table>
+</tmpl_if>
+
+<br />
+<br />
+
+<script type="text/javascript" defer="defer">
+<!--
+function toggleDiv(divId) {
+   if (document.getElementById(divId).style.visibility == "none") {
+	document.getElementById(divId).style.display = "block";
+   } else {
+	document.getElementById(divId).style.display = "none";
+   }
+}
+//-->
+</script>
+
+<tmpl_loop question_loop>
+	<b><tmpl_var question></b>
+	<tmpl_if question.isRadioList>
+		<table class="tableData">
+		<tr class="tableHeader"><td style="width:60%"><tmpl_var answer.label></td>
+		<td style="width:20%"><tmpl_var response.count.label></td>
+		<td style="width:20%"><tmpl_var response.percent.label></td></tr>
+		<tmpl_loop answer_loop>
+			<tmpl_if answer.isCorrect>
+				<tr class="highlight">
+			<tmpl_else>
+				<tr>
+			</tmpl_if>
+			<td><tmpl_var answer></td>
+			<td><tmpl_var answer.response.count></td>
+			<td><tmpl_var answer.response.percent></td>
+			<tmpl_if allowComment>
+				<td><a href="#" onclick="toggle('comment<tmpl_var answer.id>');"><tmpl_var show.comments.label></a></td>
+			</tmpl_if>
+			</tr>
+			<tmpl_if question.allowComment>
+				<tr id="comment<tmpl_var answer.id>">
+				<td colspan="3">
+				<tmpl_loop comment_loop>
+					<p><tmpl_var answer.comment></p>
+				</tmpl_loop>
+				</td>
+				</tr>
+			</tmpl_if>
+		</tmpl_loop>
+		</table>
+	<tmpl_else>
+		<br />
+		<a href="#" onclick="toggle('response<tmpl_var question.id>');"><tmpl_var show.answers.label></a>
+		<br />
+		<div id="response<tmpl_var question.id>">
+		<tmpl_loop answer_loop>
+			<p><tmpl_var answer.response></p>
+			<tmpl_if question.allowComment>
+				<blockquote><tmpl_var answer.comment></blockquote>
+			</tmpl_if>
+		</tmpl_loop>
+		</div>
+	</tmpl_if>
+	<br /><br /><br />
+</tmpl_loop>
+
+<tmpl_if pagination.pageCount.isMultiple>
+	<div class="pagination">
+		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo20> &middot; <tmpl_var pagination.nextPage>
+	</div>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_response.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_response.tmpl
new file mode 100644
index 000000000..d0bb8adab
--- /dev/null
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_response.tmpl
@@ -0,0 +1,39 @@
+#PBtmpl0000000000000064
+
+<h2><tmpl_var title></h2>
+
+<tmpl_if user.canViewReports>
+	<a href="<tmpl_var survey.url>"><tmpl_var survey.label></a> 
+	&bull;
+	<a href="<tmpl_var report.overview.url>"><tmpl_var report.overview.label></a> 
+	&bull;
+	<a href="<tmpl_var report.gradebook.url>"><tmpl_var report.gradebook.label></a> 
+</tmpl_if>
+<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a><p/>
+<b><tmpl_var start.date.label>:</b> <tmpl_var start.date.human> <tmpl_var start.time.human><br />
+<b><tmpl_var end.date.label>:</b> <tmpl_var end.date.human> <tmpl_var end.time.human><br />
+<b><tmpl_var duration.label>:</b> <tmpl_var duration.minutes> <tmpl_var duration.minutes.label> <tmpl_var duration.seconds> <tmpl_var duration.seconds.label>
+
+<p/>
+<tmpl_loop question_loop>
+
+               <b><tmpl_var question></b><br />
+                  <table class="tableData" width="100%">
+<tmpl_if question.isRadioList>
+               
+    <tr><td valign="top" class="tableHeader" style="width:25%;">
+                               <tmpl_var answer.label></td><td style="width:75%">
+                   <tmpl_var question.answer>                       
+</td></tr>
+        </tmpl_if>
+               <tr><td style="width:25%" valign="top" class="tableHeader"><tmpl_var response.label></td>
+               
+<td style="width:75%"><tmpl_var question.response></td></tr>
+                <tmpl_if question.comment>
+                        <tr><td valign="top" class="tableHeader">
+                                <tmpl_var comment.label> </td>
+                                <td><tmpl_var question.comment></td></tr>
+               </tmpl_if>
+
+       </table><p/>
+</tmpl_loop>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_survey.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_survey.tmpl
new file mode 100644
index 000000000..4497c7365
--- /dev/null
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_survey.tmpl
@@ -0,0 +1,113 @@
+#PBtmpl0000000000000061
+
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+	<p />
+</tmpl_if>
+
+<tmpl_if user.canTakeSurvey>
+	<tmpl_if response.isComplete>
+		<tmpl_if mode.isSurvey>
+			<tmpl_var thanks.survey.label>
+		<tmpl_else>
+			<tmpl_var thanks.quiz.label>
+			<div align="center">
+				<b><tmpl_var questions.correct.count.label>:</b> <tmpl_var questions.correct.count> / <tmpl_var questions.total>
+				<br />
+				<b><tmpl_var questions.correct.percent.label>:</b><tmpl_var questions.correct.percent>%
+			</div>
+		</tmpl_if>
+		<tmpl_if user.canRespondAgain>
+			<br /><br /><a href="<tmpl_var start.newResponse.url>"><tmpl_var start.newResponse.label></a>
+		</tmpl_if>
+	<tmpl_else>
+		<tmpl_if response.id>
+			<tmpl_var form.header>
+			<table width="50%" cellpadding="3" cellspacing="0" border="0" class="content">
+				<tr>
+					<td valign="top">
+					<tmpl_loop question_loop>
+						<p><tmpl_var question.question></p>
+						<tmpl_var question.answer.label><br />
+						<tmpl_var question.answer.field><br />
+						<br />
+						<tmpl_if question.allowComment>
+							<tmpl_var question.comment.label><br />
+							<tmpl_var question.comment.field><br />
+						</tmpl_if>
+					</tmpl_loop>
+					</td>
+					<td valign="top" style="white-space:nowrap;">
+						<b><tmpl_var questions.sofar.label>:</b> <tmpl_var questions.sofar.count> / <tmpl_var questions.total> <br />
+						<tmpl_unless mode.isSurvey>
+							<b><tmpl_var questions.correct.count.label>:</b> <tmpl_var questions.correct.count> / <tmpl_var questions.sofar.count><br />
+							<b><tmpl_var questions.correct.percent.label>:</b><tmpl_var questions.correct.percent>% / 100%<br />
+						</tmpl_unless>
+					</td>
+				</tr>
+				<tr>
+					<td align="right" colspan="2"><tmpl_var form.submit></td>
+				</tr>
+			</table>
+			
+			<tmpl_var form.footer>
+		<tmpl_else>
+			<a href="<tmpl_var start.newResponse.url>"><tmpl_var start.newResponse.label></a>
+		</tmpl_if>
+	</tmpl_if>
+<tmpl_else>
+	<tmpl_if mode.isSurvey>
+		<tmpl_var survey.noprivs.label>
+	<tmpl_else>
+		<tmpl_var quiz.noprivs.label>
+	</tmpl_if>
+</tmpl_if>
+<br />
+<br />
+<tmpl_if user.canViewReports>
+<table cellspacing="2" cellpadding="1" style="border:solid silver 1px;">
+<tr>
+	<td colspan="4">
+		<table width="100%" cellspacing="2" cellpadding="1">
+		<tr>
+			<td style="width:33%;text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var report.gradebook.url>"><tmpl_var report.gradebook.label></a></td>
+			<td style="width:33%;text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var report.overview.url>"><tmpl_var report.overview.label></a></td>
+			<td style="width:33%;text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var delete.all.responses.url>"><tmpl_var delete.all.responses.label></a></td>
+		</tr>
+		</table>
+	</td>
+</tr>
+<tr>
+	<td style="text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var export.answers.url>"><tmpl_var export.answers.label></a></td>
+	<td style="text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var export.questions.url>"><tmpl_var export.questions.label></a></td>
+	<td style="text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var export.responses.url>"><tmpl_var export.responses.label></a></td>
+	<td style="text-align:center;background-color:#F0F0F0;"><a href="<tmpl_var export.composite.url>"><tmpl_var export.composite.label></a></td>
+</tr>
+</table>
+	
+</tmpl_if>
+
+<tmpl_if session.var.adminOn>
+	<p style="border:solid silver 1px;width:150px;padding:2px;text-align:center;margin-bottom:2px;"><a style="text-align:center;background-color:#F0F0F0;width:100%;display:block;" href="<tmpl_var section.add.url>"><tmpl_var section.add.label></a></p>
+	<p style="border:solid silver 1px;width:150px;padding:2px;text-align:center;margin-top:2px;"><a style="text-align:center;background-color:#F0F0F0;width:100%;display:block;" href="<tmpl_var question.add.url>"><tmpl_var question.add.label></a></p>
+<tmpl_loop section.edit_loop>
+<tmpl_var section.edit.controls>
+<tmpl_var section.edit.sectionName><br /><br />
+	<tmpl_loop section.questions_loop>
+		&nbsp;&nbsp;<tmpl_var question.edit.controls>
+          	<tmpl_var question.edit.question>
+		<br />
+        </tmpl_loop>
+</tmpl_loop>
+<br /><br />
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_syndicated_content.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_syndicated_content.tmpl
new file mode 100644
index 000000000..b03a25a25
--- /dev/null
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_syndicated_content.tmpl
@@ -0,0 +1,43 @@
+#PBtmpl0000000000000065
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+	<p />
+</tmpl_if>
+
+<h2>
+<tmpl_if channel.link>
+	<a href="<tmpl_var channel.link>"><tmpl_var channel.title></a>
+<tmpl_else>
+	<tmpl_var channel.title>
+</tmpl_if>
+</h2>
+
+<tmpl_if channel.description>
+	<tmpl_var channel.description>
+	<p />
+</tmpl_if>
+
+<ul>
+<tmpl_loop item_loop>
+<li>
+	<tmpl_if link>
+		<a href="<tmpl_var link>"><tmpl_var title></a>
+	<tmpl_else>
+		<tmpl_var title>
+	</tmpl_if>
+	<tmpl_if description>
+		- <tmpl_var description>
+	</tmpl_if>
+</li>	
+</tmpl_loop>
+</ul>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_syndicated_articles.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_syndicated_articles.tmpl
new file mode 100644
index 000000000..eef2f5baf
--- /dev/null
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_syndicated_articles.tmpl
@@ -0,0 +1,40 @@
+#GNvjCFQWjY2AF2uf0aCM8Q
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description><p />
+</tmpl_if>
+
+<h2>
+<tmpl_if channel.link>
+	<a href="<tmpl_var channel.link>"><tmpl_var channel.title></a>
+<tmpl_else>
+	<tmpl_var channel.title>
+</tmpl_if>
+</h2>
+
+<tmpl_if channel.description>
+	<tmpl_var channel.description><p />
+</tmpl_if>
+
+<tmpl_loop item_loop>
+	<b><tmpl_var title></b>
+	<tmpl_if description>
+		<br />
+		<tmpl_var description>
+	</tmpl_if>
+	<tmpl_if link>
+		<br />
+		<a href="<tmpl_var link>" style="font-size: 9px;">Read More...</a>
+	</tmpl_if>
+	<br />
+	<br />
+</tmpl_loop>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_weatherdata_default_view.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_weatherdata_default_view.tmpl
new file mode 100644
index 000000000..69c654db5
--- /dev/null
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_weatherdata_default_view.tmpl
@@ -0,0 +1,40 @@
+#WeatherDataTmpl0000001
+<a name="<tmpl_var assetId>"></a> 
+ 
+<tmpl_if session.var.adminOn> 
+   <p><tmpl_var controls></p> 
+</tmpl_if>
+
+<tmpl_if displayTitle>
+    <h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+    <tmpl_var description><p />
+</tmpl_if>
+
+<tmpl_loop ourLocations.loop>
+<table border="0" width="100%">
+<tr>
+	<td rowspan="3" style="width:55px;"><img src="<tmpl_var iconUrl>" /></td>
+	<td style="background-color:#E0E0E0;">
+		<div class="weatherTitle">
+			<div style="float:left;">&#160;<b><tmpl_var cityState></b></div>
+
+			<div style="float:right;margin-right:1px;margin-top:2px;vertical-align:middle;">
+				<a href="#" style="color:gray;font-weight:bold;">X</a>
+			</div>
+		</div>
+	</td>
+</tr>
+<tr>
+	<td>
+		<tmpl_var sky><br /><tmpl_var tempF>&deg;F<br />
+	</td>
+</tr>
+<tr>
+	<td><br /></td>
+</tr>
+</table>
+
+</tmpl_loop>