diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index cb926d7c6..6db49ea48 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,6 @@
 7.4.0
+ - Added a realtime workflow option for content publishing.
+ - Added switches to auto request commit operations and skip adding comments.
  - fix: old recurring events were not deleted when changing recurrence pattern
  - fix: unable to remove recurrence on events
  - RFE: Search asset feedback. i.e. 'No results found'
@@ -19,6 +21,9 @@
  - fix: Unable to upload images or edit listings for Matrix
 
 
+7.3.19
+ - Fixed a formatting problem in the workflow editor screen.
+
 
 7.3.18
  - fix: Old registrants appear in new EMS asset
diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index bfb06a652..025303c8b 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -7,9 +7,14 @@ upgrading from one version to the next, or even between multiple
 versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
+
 7.4.0
 --------------------------------------------------------------------
 
+ * You must upgrade to the latest 7.3.x release before upgrading to
+    7.4.0 or you will encounter fatal errors during the upgrade
+    process.
+
  * The userProfileData table has been completely re-done. Now, each
    user profile field has its own column in the userProfileData table.
 
diff --git a/docs/upgrades/templates-6.99.0/adminbar.tmpl b/docs/upgrades/templates-6.99.0/adminbar.tmpl
deleted file mode 100644
index f2bf75088..000000000
--- a/docs/upgrades/templates-6.99.0/adminbar.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-#PBtmpl0000000000000090
-<script type="text/javascript">
-//<![CDATA[
-	var slider = new createSlidePanelBar("WebGUIAdminBar");
-	var panel;
-	<tmpl_loop adminbar_loop>
-		panel = new createPanel("<tmpl_var name>", "<tmpl_var label>");
-		<tmpl_loop items>
-			panel.addLink("<tmpl_var icon>", "<tmpl_var title escape=JS>", "<tmpl_var url escape=JS>");
-		</tmpl_loop>
-		slider.addPanel(panel);
-	</tmpl_loop>
-	slider.draw();
-
-//]]>
-</script>
-~~~
-<script src="^Extras(slidePanel/slidePanel.js);" type="text/javascript"></script>
-<link href="^Extras(slidePanel/slidePanel.css);" rel="stylesheet" type="text/css" />
diff --git a/docs/upgrades/templates-6.99.0/help.tmpl b/docs/upgrades/templates-6.99.0/help.tmpl
deleted file mode 100644
index 5b5047d90..000000000
--- a/docs/upgrades/templates-6.99.0/help.tmpl
+++ /dev/null
@@ -1,50 +0,0 @@
-#PBtmplHelp000000000001
-<p><tmpl_var body></p>
-
-<tmpl_if fields>
-<dl>
-	<tmpl_loop fields>
-   		<dt><tmpl_var title></dt>
-	        <dd><tmpl_var description>
-			<tmpl_if uiLevel> <br /><i><tmpl_var uiLevelLabel>:</i><tmpl_var uiLevel><br /> </tmpl_if>
-		</dd>
-        </tmpl_loop>
-</dl>
-</tmpl_if>
-
-<tmpl_if variable_loop1>
-	<dl> <tmpl_loop variable_loop1>
-		<dt><tmpl_var title></dt>
-		<dd><tmpl_var description>
-		<tmpl_if variable_loop2>
-			<dl> <tmpl_loop variable_loop2>
-				<dt><tmpl_var title></dt>
-				<dd><tmpl_var description>
-				<tmpl_if variable_loop3>
-					<dl> <tmpl_loop variable_loop3>
-						<dt><tmpl_var title></dt>
-						<dd><tmpl_var description>
-						<tmpl_if variable_loop4>
-							<dl> <tmpl_loop variable_loop4>
-								<dt><tmpl_var title></dt>
-								<dd><tmpl_var description></dd>
-							</tmpl_loop> </dl>
-						</tmpl_if></dd>
-					</tmpl_loop> </dl>
-				</tmpl_if></dd>
-			</tmpl_loop> </dl>
-		</tmpl_if></dd>
-	</tmpl_loop> </dl>
-</tmpl_if>
-
-~~~
-<style type="text/css">
-dd {
-	margin-bottom: 15px;
-}
-
-dt {
-	font-weight: bold;	
-}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.0/inbox.tmpl b/docs/upgrades/templates-6.99.0/inbox.tmpl
deleted file mode 100644
index e04de8573..000000000
--- a/docs/upgrades/templates-6.99.0/inbox.tmpl
+++ /dev/null
@@ -1,53 +0,0 @@
-#PBtmpl0000000000000206
-#create
-#namespace:Inbox
-#url:default_inbox
-#title:Default Inbox
-#menuTitle:Default Inbox
-<h1><tmpl_var title></h1>
-
-<table width="100%" cellspacing="1" cellpadding="2" border="0">
-<tr>
-   <td class="tableHeader">
-      <tmpl_var subject.label>
-   </td>
-   <td class="tableHeader">
-      <tmpl_var status.label>
-   </td>
-   <td class="tableHeader">
-      <tmpl_var dateStamp.label>
-   </td>
-</tr>
-<tmpl_if noresults>
-   <tr>
-       <td class="tableData">
-          <tmpl_var noresults>
-       </td>
-       <td class="tableData">
-          &nbsp;
-       </td>
-       <td class="tableData">
-          &nbsp;
-       </td>
-   </tr>
-<tmpl_else>
-   <tmpl_loop messages>
-      <tr>
-         <td class="tableData">
-            <tmpl_var subject>
-         </td>
-         <td class="tableData">
-            <tmpl_var status>
-         </td>
-         <td class="tableData">
-            <tmpl_var dateStamp>
-         </td>
-     </tr>
-  </tmpl_loop>
-</tmpl_if>
-</table>
-   <ul class="accountOptions">
-      <tmpl_loop accountOptions>
-         <li><tmpl_var options.display>
-      </tmpl_loop>
-   </ul>
diff --git a/docs/upgrades/templates-6.99.0/inboxmessage.tmpl b/docs/upgrades/templates-6.99.0/inboxmessage.tmpl
deleted file mode 100644
index cac0dafca..000000000
--- a/docs/upgrades/templates-6.99.0/inboxmessage.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-#PBtmpl0000000000000205
-#create
-#namespace:Inbox/Message
-#url:default_inbox_message
-#title:Default Inbox Message
-#menuTitle:Default Inbox Message
-<h1><tmpl_var title></h1>
-<b><tmpl_var subject></b><br />
-<tmpl_var dateStamp><br />
-<tmpl_var status><br /><br />
-<p> <tmpl_var message></p>
-
-<ul class="accountOptions">
-	<tmpl_loop accountOptions><li><tmpl_var options.display></li>
-        </tmpl_loop>
-</ul>
-
diff --git a/docs/upgrades/templates-6.99.0/requesttracker.tmpl b/docs/upgrades/templates-6.99.0/requesttracker.tmpl
deleted file mode 100644
index be422fd03..000000000
--- a/docs/upgrades/templates-6.99.0/requesttracker.tmpl
+++ /dev/null
@@ -1,110 +0,0 @@
-#PBtmpl0000000000000208
-#create
-#namespace:Collaboration
-#url:request-tracker-template
-#title:Request Tracker
-#menuTitle:Request Tracker
-<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>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&#149;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&#149;
-	</tmpl_unless>
-	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-</p>
-
-<table width="100%">
-<tr>
-	<td class="forumHead"><a href="<tmpl_var sortby.title.url>"><tmpl_var subject.label></a></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.username.url>"><tmpl_var user.label></a></td>
-<tmpl_if karmaIsEnabled>
-	<td class="forumHead"><a href="<tmpl_var sortby.karmaRank.url>"><tmpl_var karmaRank.label></a></td>
-</tmpl_if karmaIsEnabled>
-	<td class="forumHead"><a href="<tmpl_var sortby.rating.url>"><tmpl_var rating.label></a></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.date.url>"><tmpl_var date.label></a></td>
-	<tmpl_if displayLastReply>
-		<td class="forumHead"><a href="<tmpl_var sortby.lastreply.url>"><tmpl_var lastReply.label></a></td>
-	</tmpl_if>
-</tr>
-<tmpl_loop post_loop>
-<tr>
-
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a></td>
-	<tmpl_if user.isVisitor>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var username></td>
-	<tmpl_else>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var userProfile.url>"><tmpl_var username></a></td>
-	</tmpl_if>
-<tmpl_if karmaIsEnabled>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" align="center"><tmpl_var karmaRank></td>
-</tmpl_if>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" align="center"><tmpl_var rating></td>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateSubmitted.human> @ <tmpl_var timeSubmitted.human></td>
-	<tmpl_if displayLastReply>
-		<td  class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" style="font-size: 11px;">
-			<a href="<tmpl_var lastReply.url>"><tmpl_var lastReply.title></a>
-			by
-			<tmpl_if lastReply.user.isVisitor>
-				<tmpl_var lastReply.username>
-			<tmpl_else>
-				<a href="<tmpl_var lastReply.userProfile.url>"><tmpl_var lastReply.username></a>
-			</tmpl_if>
-			on <tmpl_var lastReply.dateSubmitted.human> @ <tmpl_var lastReply.timeSubmitted.human>
-		</td>
-	</tmpl_if>
-</tr>
-</tmpl_loop>
-</table>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage>  &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-
-~~~
-
-<style type="text/css">
-.forumHead {
-	background-color: #eeeeee;
-	border-bottom: 1px solid #cccccc;
-	padding: 2px;
-	padding-bottom: 4px;
-	font-size: 13px;
-	font-weight: bold;
-}
-.oddThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #83cc83;
-	padding-bottom: 4px;
-}
-.evenThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #aaaaff;
-	padding-bottom: 4px;
-}
-</style>
-
-
-
diff --git a/docs/upgrades/templates-6.99.0/requesttrackerpost.tmpl b/docs/upgrades/templates-6.99.0/requesttrackerpost.tmpl
deleted file mode 100644
index 2df3184a1..000000000
--- a/docs/upgrades/templates-6.99.0/requesttrackerpost.tmpl
+++ /dev/null
@@ -1,343 +0,0 @@
-#PBtmpl0000000000000209
-#create
-#namespace:Collaboration/Thread
-#url:request-tracker-post-template
-#title:Request Tracker Post
-#menuTitle:Request Tracker Post
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<div class="defaultSubmissionDetails">
-	<b><tmpl_var user.label>:</b> 
-		<tmpl_if user.isVisitor>
-			<tmpl_var username>
-		<tmpl_else>
-			<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-		</tmpl_if>
-		<br />
-	<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-	<b><tmpl_var severity.label>:</b> <tmpl_var userDefined1><br />
-	<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-	<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-		<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-		</tmpl_unless>
-		<br />
-	<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> &nbsp; &nbsp; [ <a href="<tmpl_var unarchive.url>"><tmpl_var open.label></a> <tmpl_else> <tmpl_var open.label> &nbsp; &nbsp; [ <a href="<tmpl_var archive.url>"><tmpl_var close.label></a></tmpl_if> ]<br />
-	<tmpl_else>	
-		<tmpl_if user.isPoster>
-			<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> <tmpl_else> <tmpl_var open.label></tmpl_if><br />
-		</tmpl_if>	
-	</tmpl_if>	
-<tmpl_if karmaIsEnabled>
-	<b><tmpl_var karmaRank.label>:</b> <tmpl_var karmaRank><br />
-<b><tmpl_var transferkarma.label>:</b>
-<tmpl_var transfer.karma.form>
-</tmpl_if>	
-</div>
-
-<div class="collaborationThreadContent">
-	<tmpl_var content>
-</div>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-
-
-<tmpl_if repliesAllowed>
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<div style="float: left; width: 50%">
-							<b><tmpl_var user.label>:</b> 
-								<tmpl_if user.isVisitor>
-									<tmpl_var username>
-								<tmpl_else>
-									<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-								</tmpl_if>
-								<br />
-							<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-						</div>	
-						<div>
-							<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-
-														</div>	
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-							<div style="float: left; width: 50%">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-							</div>	
-							<div>
-																<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-									<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-									</tmpl_unless>
-									<br />
-																</div>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>
-	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a>				
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-.defaultSubmissionDetails
-{
-	float: right; 		
-	padding: 2px; 
-	margin: 2px;
-	font-size:9pt;
-	font-family:arial;
-}
-
-.defaultSubmissionDetails a
-{
-	color:#29587E;
-}
-
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.postControls {
-	border-top: 1px solid #cccccc;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.threadData {
-	font-size: 11px;
-	padding: 3px;
-	font-family:arial;
-}
-
-.postControls
-{
-	background:#C0C0C0;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-
-.postControls a
-{
-	color:white;
-}
-
-.collaborationThreadContent
-{
-	height:100px;
-	font-family:arial;
-	font-size:9pt;
-}
-
-#mainText > .collaborationThreadContent
-{
-	height:auto;
-	min-height:100px;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.0/requesttrackerpostform.tmpl b/docs/upgrades/templates-6.99.0/requesttrackerpostform.tmpl
deleted file mode 100644
index c9b5b5195..000000000
--- a/docs/upgrades/templates-6.99.0/requesttrackerpostform.tmpl
+++ /dev/null
@@ -1,111 +0,0 @@
-#PBtmpl0000000000000210
-#create
-#namespace:Collaboration/PostForm
-#url:request-tracker-template
-#title:Request Tracker
-#menuTitle:Request Tracker
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if preview.title>
-	<p><b><tmpl_var preview.title></b></p>
-</tmpl_if>
-
-<tmpl_if preview.content>
-	<p><tmpl_var preview.content></p>
-</tmpl_if>
-
-<h2><tmpl_var message.header.label></h2>
-
-<tmpl_var form.header>
-<table class="defaultPostForm">
-	<tmpl_if isNewPost>
-		<tmpl_if user.isVisitor>
-			<tr>
-				<td><tmpl_var visitorName.label></td>
-				<td><tmpl_var visitorName.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td><tmpl_var subject.label></td>
-		<td><tmpl_var title.form></td>
-	</tr>
-	<tr>
-		<td><tmpl_var severity.label></td>
-		<td><select id="myCustomField1" name="userDefined1">
-<option value="<tmpl_var cosmetic.label>"><tmpl_var cosmetic.label></option>
-<option value="<tmpl_var minor.label>"><tmpl_var minor.label></option>
-<option value="<tmpl_var critical.label>"><tmpl_var critical.label></option>
-<option value="<tmpl_var fatal.label>"><tmpl_var fatal.label></option>
-</select>
-<script type="text/javascript">
-  var value = '<tmpl_var name="userDefined1" escape="JS">';
-  var field = document.getElementById("myCustomField1");
-  for (var i = 0; i < field.options.length; i++) {
-    if (field.options[i].value == value)  {
-       field.selectedIndex = i;
-    }  
-  }
-</script>
-</td>
-	</tr>
-	<tr>
-		<td><tmpl_var description.label></td>
-		<td><tmpl_var content.form></td>
-	</tr>
-	<tmpl_if attachment.form>
-		<tr>
-			<td><tmpl_var attachment.label></td>
-			<td><tmpl_var attachment.form></td>
-		</tr>
-	</tmpl_if>
-<tmpl_if user.isModerator><tmpl_if karmaIsEnabled><tmpl_if isThread>
-				<tr>
-					<td><tmpl_var karmaScale.label></td>
-					<td><tmpl_var karmaScale.form></td>
-				</tr>
-</tmpl_if></tmpl_if></tmpl_if>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<p><b><tmpl_var reply.title></b></p>
-	<tmpl_var reply.content>
-</tmpl_if>
-~~~
-<style type="text/css">
-table.defaultPostForm td
-{
-	font-family:arial;
-	font-size:9pt;
-}
-h2
-{
-	font-family:arial;
-}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.0/sqlform_edit.tmpl b/docs/upgrades/templates-6.99.0/sqlform_edit.tmpl
deleted file mode 100644
index 72a1fb417..000000000
--- a/docs/upgrades/templates-6.99.0/sqlform_edit.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-#SQLFormEditTmpl0000001
-#create
-#title:Default SQLForm Edit template
-#menuTitle:Default SQLForm Edit template
-#url:default_sqlform_edit_template
-#namespace:SQLForm/Edit
-<a name="id<tmpl_var assetId>"></a>
-<tmpl_if session.var.adminOn>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<div class="SQLForm-contentBox">
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_unless isNew>
-	<a href="<tmpl_var viewHistory.url>"><tmpl_var viewHistory.label></a><br /><br />
-</tmpl_unless>
-
-<tmpl_if errorOccurred>
-	<h1>Some errors occurred</h1>
-	<ul>
-	<tmpl_loop errorLoop>
-		<li><tmpl_var error.message></li>
-	</tmpl_loop>
-	</ul>
-</tmpl_if>
-
-<tmpl_var managementLinks>
-
-<tmpl_var completeForm>
-</div>
diff --git a/docs/upgrades/templates-6.99.0/sqlform_search.tmpl b/docs/upgrades/templates-6.99.0/sqlform_search.tmpl
deleted file mode 100644
index c6b363aa7..000000000
--- a/docs/upgrades/templates-6.99.0/sqlform_search.tmpl
+++ /dev/null
@@ -1,85 +0,0 @@
-#SQLFormSearchTmpl00001
-#create
-#title:Default SQLForm Search template
-#menuTitle:Default SQLForm Search template
-#url:default_sqlform_search_template
-#namespace:SQLForm/Search
-<a name="id<tmpl_var assetId>"></a>
-<tmpl_if session.var.adminOn>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<div class="SQLForm-contentBox">
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_var managementLinks>
-
-<h2>Search records</h2>
-<a href="<tmpl_var superSearch.url>"><tmpl_var superSearch.label></a><br>
-
-<tmpl_if errorOccurred>
-Some error(s) occurred:
-<ul>
-	<tmpl_loop errorLoop>
-	<li><tmpl_var error.message></li>
-	</tmpl_loop>
-</ul>
-</tmpl_if>
-
-<tmpl_var searchForm>
-
-<tmpl_if showFieldsDefined>
-<tmpl_var searchResults.header>
-<tmpl_var searchResults.actionButtons>
-<table border="0">
-	<tr>
-		<th></th>
-		<tmpl_if showMetaData>
-		<th>Last update</th>
-		<th>Last update by</th>
-		</tmpl_if>
-	<tmpl_loop headerLoop>
-		<th <tmpl_if
-header.sort.onThis>color="red"</tmpl_if>>
-			<a href="<tmpl_var header.sort.url>">
-			<tmpl_var header.title> 
-			<tmpl_if header.sort.onThis><tmpl_if header.sort.ascending>(asc)<tmpl_else>(desc)</tmpl_if></tmpl_if></a></th>
-	</tmpl_loop>
-	</tr>
-	<tmpl_loop searchResults.recordLoop>
-	<tr>
-		<td><tmpl_var record.controls></td>
-		<tmpl_if showMetaData>
-		<td><tmpl_var record.updateDate></td>
-		<td><tmpl_var record.updatedBy></td>
-		</tmpl_if>
-		<tmpl_loop record.valueLoop>
-		<td>
-		<tmpl_if record.value.isFile>
-			<tmpl_if record.value>
-				<a href="<tmpl_var record.value.downloadUrl>">
-				<tmpl_if record.value.isImage>
-					<img width="100" src="<tmpl_var record.value.downloadUrl>">
-				<tmpl_else>
-					Click here for file
-				</tmpl_if>
-				</a>
-			</tmpl_if>
-		<tmpl_else>
-			<tmpl_var record.value>
-		</tmpl_if>
-		</td>
-		</tmpl_loop>
-	</tr>
-	</tmpl_loop>
-</table>
-<tmpl_var searchResults.actionButtons>
-<tmpl_var searchResults.footer>
-<tmpl_else>
-No fields are defined to be shown in the search results.
-</tmpl_if>
-
-</div>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_1_over_3.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_1_over_3.tmpl
deleted file mode 100755
index 489bac5cd..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_1_over_3.tmpl
+++ /dev/null
@@ -1,149 +0,0 @@
-#PBtmpl0000000000000109
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-<p><tmpl_var controls></p>
-</tmpl_if>
-
-
-<tmpl_if displayTitle>
-  <h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-  <p><tmpl_var description></p>
-</tmpl_if>
-
-<!-- begin position 1 -->
-<div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position1" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position1_loop>
-	<tmpl_if showAdmin>
-            	<tr id="td<tmpl_var id>">
-            		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-         			</div></td>
-            	</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-            </tbody></table>
-</tmpl_if>
-</div>
-<!-- end position 1 -->
-
-<div class="endFloat">&nbsp;</div>
-
-<!-- begin position 2 -->
-<div class="firstColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position2" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position2_loop>
-	<tmpl_if showAdmin>
-            	<tr id="td<tmpl_var id>">
-            		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-         			</div></td>
-            	</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-            </tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 2 -->
-
-<!-- begin position 3 -->
-<div class="secondColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position3" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position3_loop>
-	<tmpl_if showAdmin>
-            	<tr id="td<tmpl_var id>">
-            		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-         			</div></td>
-            	</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-            </tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 3 -->
-
-<!-- begin position 4 -->
-<div class="secondColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position4" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position4_loop>
-	<tmpl_if showAdmin>
-            	<tr id="td<tmpl_var id>">
-            		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-         			</div></td>
-            	</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-            </tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 4 -->
-
-<div class="endFloat">&nbsp;</div>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-            <tmpl_var dragger.init>
-</tmpl_if>
-
-~~~
-<style type="text/css">
-.firstColumn {
-  float: left;
-  width: 33%;
-}
-.secondColumn {
-        float: left;
-        width: 33%;
-}
-.thirdColumn {
-        float: left;
-        width: auto;
-        max-width: 33%;
-}
-.endFloat {
- clear: both;
-}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_admin_console.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_admin_console.tmpl
deleted file mode 100644
index 0df172f7c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_admin_console.tmpl
+++ /dev/null
@@ -1,70 +0,0 @@
-#PBtmpl0000000000000001
-
-
-<div id="application_title">
-	<tmpl_var application.title>
-</div>
-<div id="application_workarea">
-	<tmpl_var application.workArea>
-</div>
-<div id="console_workarea">
-	<div class="adminConsoleSpacer">
-		&#160;
-	</div>
-	<tmpl_loop application_loop>
-		<tmpl_if canUse>
-			<div class="adminConsoleApplication">
-				<a href="<tmpl_var url>"><img src="<tmpl_var icon>" style="border-style:none;" title="<tmpl_var title>" alt="<tmpl_var title>" /></a><br />
-				<a href="<tmpl_var url>"><tmpl_var title></a>
-			</div>
-		</tmpl_if>
-	</tmpl_loop>
-	<div class="adminConsoleSpacer">
-		&#160;
-	</div>
-</div>
-<div class="adminConsoleMenu">
-	<div id="adminConsoleMainMenu" class="adminConsoleMainMenu">
-		<div id="console_toggle_on">
-			<a href="#" onclick="toggleAdminConsole()"><tmpl_var toggle.on.label></a><br />
-		</div>
-		<div id="console_toggle_off">
-			<a href="#" onclick="toggleAdminConsole()"><tmpl_var toggle.off.label></a><br />
-		</div>
-	</div>
-	<div id="adminConsoleApplicationSubmenu" class="adminConsoleApplicationSubmenu">
-		<tmpl_loop submenu_loop>
-			<a href="<tmpl_var url>" <tmpl_var extras>><tmpl_var label></a><br />
-		</tmpl_loop>
-	</div>
-	<div id="adminConsoleUtilityMenu" class="adminConsoleUtilityMenu">
-		<a href="<tmpl_var backtosite.url>"><tmpl_var backtosite.label></a><br />
-		^AdminToggle;<br />
-		^LoginToggle;<br />
-	</div>
-</div>
-<div id="console_title">
-	<tmpl_var console.title>
-</div>
-<div id="application_help">
-	<tmpl_if help.url>
-		<a href="<tmpl_var help.url>"><img src="^Extras(adminConsole/small/help.gif);" alt="?" style="border-style:none;" /></a>
-	</tmpl_if>
-</div>
-<div id="application_icon">
-	<img src="<tmpl_var application.icon>" style="border-style:none;" title="<tmpl_var application.title>" alt="<tmpl_var application.title>" />
-</div>
-<div class="adminConsoleTitleIconMedalian">
-<img src="^Extras(adminConsole/medalian.gif);" style="border-style:none;" alt="*" />
-</div>
-<div id="console_icon">
-	<img src="<tmpl_var console.icon>" style="border-style:none;" title="<tmpl_var console.title>" alt="<tmpl_var console.title>" />
-</div>
-<script type="text/javascript" defer="defer">
-	initAdminConsole(<tmpl_if application.title>true<tmpl_else>false</tmpl_if>,<tmpl_if submenu_loop>true<tmpl_else>false</tmpl_if>);
-</script>
-
-~~~
-<link href="^Extras(adminConsole/adminConsole.css);" type="text/css" rel="stylesheet" />
-<script src="^Extras(adminConsole/adminConsole.js);" type="text/javascript"></script>
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_autogen_m.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_autogen_m.tmpl
deleted file mode 100644
index 2e5932ce2..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_autogen_m.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-#PBtmpl0000000000000075
-		<tmpl_if displayTitle>
-		<h2><tmpl_var title></h2>
-		</tmpl_if>
-		<tmpl_if description>
-			<p><tmpl_var description></p>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-<tmpl_var controls>
-</tmpl_if>
-<span class="horizontalMenu">
-<tmpl_loop page_loop>
-<a class="horizontalMenu" 
-   <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
-   <tmpl_unless "__last__"> &middot; </tmpl_unless>
-</tmpl_loop>
-</span>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_autogen_t.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_autogen_t.tmpl
deleted file mode 100644
index c3738d799..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_autogen_t.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-#PBtmpl0000000000000071
-		<tmpl_if displayTitle>
-		<h1><tmpl_var title></h1>
-		</tmpl_if>
-		<tmpl_if description>
-			<p><tmpl_var description></p>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-<tmpl_var controls>
-</tmpl_if>
-<span class="horizontalMenu">
-<tmpl_loop page_loop>
-<a class="horizontalMenu"
-   <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
-   <tmpl_unless "__last__"> &middot; </tmpl_unless>
-</tmpl_loop>
-</span>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_benefits_showcase.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_benefits_showcase.tmpl
deleted file mode 100644
index 4a749e661..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_benefits_showcase.tmpl
+++ /dev/null
@@ -1,105 +0,0 @@
-#PBtmpl0000000000000095
-<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 image1>
-	<img src="<tmpl_var image1>" alt="<tmpl_var image1>" class="noBorder" />
-	<br />
-</tmpl_if>
-
-<table width="100%" cellpadding="3" cellspacing="3" border="0" class="benefitsShowcase">
-<tr>
-	<td class="content" valign="top">
-		<tmpl_if description>
-			<tmpl_var description>
-			<p />
-		</tmpl_if>
-		<b>Benefits</b><br />
-		<tmpl_if session.var.adminOn>
-			<a href="<tmpl_var addBenefit.url>"><tmpl_var addBenefit.label></a>
-			<p />
-		</tmpl_if>
-		<tmpl_loop benefit_loop>
-			&middot;<tmpl_if session.var.adminOn><tmpl_var benefit.controls></tmpl_if><tmpl_var benefit.benefit><br />
-		</tmpl_loop>
-	</td>
-	<td valign="top" width="34%" class="benefitsShowcase2">
-		<tmpl_if thumbnail2>
-			<a href="<tmpl_var image2>"><img src="<tmpl_var thumbnail2>" alt="<tmpl_var thumbnail2>" class="noBorder" /></a>
-			<p />
-		</tmpl_if>
-		<b>Specifications</b><br />
-		<tmpl_if session.var.adminOn>
-			<a href="<tmpl_var addSpecification.url>"><tmpl_var addSpecification.label></a>
-			<p />
-		</tmpl_if>
-		<tmpl_loop specification_loop>
-			&middot;<tmpl_if session.var.adminOn><tmpl_var specification.controls></tmpl_if><b><tmpl_var specification.label>:</b> <tmpl_var specification.specification> <tmpl_var specification.units><br />
-		</tmpl_loop>
-		<b>Options</b><br />
-		<tmpl_if session.var.adminOn>
-			<a href="<tmpl_var addaccessory.url>"><tmpl_var addaccessory.label></a>
-			<p />
-		</tmpl_if>
-		<tmpl_loop accessory_loop>
-			&middot;<tmpl_if session.var.adminOn><tmpl_var accessory.controls></tmpl_if><a href="<tmpl_var accessory.url>"><tmpl_var accessory.title></a><br />
-		</tmpl_loop>
-		<b>Other Products</b><br />
-		<tmpl_if session.var.adminOn>
-			<a href="<tmpl_var addRelatedProduct.url>"><tmpl_var addRelatedProduct.label></a>
-			<p />
-
-
-		</tmpl_if>
-		<tmpl_loop relatedproduct_loop>
-			&middot;<tmpl_if session.var.adminOn><tmpl_var RelatedProduct.controls></tmpl_if><a href="<tmpl_var relatedproduct.url>"><tmpl_var relatedproduct.title></a><br />
-		</tmpl_loop>
-	</td>
-</tr>
-</table>
-
-
-~~~
-<style type="text/css">
-.productOptions {
-	font-family: arial;
-	font-size: 11px;
-}
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.noBorder {
-	border:none;
-}
-.benefitsShowcase {
-	border:solid gray 1px;
-}
-.benefitsShowcase td {
-	font-family:arial;
-	font-size:9pt;
-}
-.benefitsShowcase2 {
-	border:solid gray 1px;
-	width:34%;
-	font-size:8pt;
-	font-family:arial;
-}
-.benefitsShowcase a {
-	color:#29587E;
-}
-.benefitsShowcase .content {
-	font-size:9pt;
-	width:66%;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_bulleted_list.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_bulleted_list.tmpl
deleted file mode 100644
index 2c9dc0edc..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_bulleted_list.tmpl
+++ /dev/null
@@ -1,56 +0,0 @@
-#PBnav00000000000bullet
-#title:Bulleted List
-#menuTitle:Bulleted List
-#url:bulleted_list
-<tmpl_if session.var.adminOn>
-<tmpl_var controls><br />
-</tmpl_if>
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<tmpl_loop page_loop>
-<tmpl_if __FIRST__>
-	<ul class="bulletList">
-</tmpl_if>
-
-
-<tmpl_loop page.depthDiff_loop>
-   </ul></li>
-</tmpl_loop>
-
-<li class="level<tmpl_var page.relDepth>"><a <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
-<tmpl_if page.hasViewableChildren>
-	<ul>
-<tmpl_else>
-	</li>
-</tmpl_if>
-
-<tmpl_if __LAST__> 
-	<tmpl_loop page.indent_loop>
-		<tmpl_unless __first__></li></tmpl_unless>
-       		</ul>
- 	</tmpl_loop>
-	</li></ul>
-</tmpl_if>
-</tmpl_loop>
-~~~
-<style type="text/css">
-ul.bulletList li, ul.bulletList ul {
-	margin-left:7px;
-	padding-left:0px;
-	font-size:9px;	
-}
-
-.bulletList .level0 {
-	font-size:13px;
-}
-
-.bulletList .level1 {
-	font-size:11px;
-}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_calendar_month_big.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_calendar_month_big.tmpl
deleted file mode 100644
index 798751e75..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_calendar_month_big.tmpl
+++ /dev/null
@@ -1,142 +0,0 @@
-#PBtmpl0000000000000022
-<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>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<tmpl_if session.var.adminOn>
-	<a href="<tmpl_var addevent.url>"><tmpl_var addevent.label></a>
-	<p />
-</tmpl_if>
-
-<tmpl_loop month_loop>
-	<br />
-	<table width="100%" class="calendarBig">
-	<tr><td colspan="7" class="tableHeader"><tmpl_var month> <tmpl_var year></td></tr>
-	<tr>
-	<tmpl_if session.user.firstDayOfWeek>
-		<th class="tableData"><tmpl_var monday.label></th>
-		<th class="tableData"><tmpl_var tuesday.label></th>
-		<th class="tableData"><tmpl_var wednesday.label></th>
-		<th class="tableData"><tmpl_var thursday.label></th>
-		<th class="tableData"><tmpl_var friday.label></th>
-		<th class="tableData"><tmpl_var saturday.label></th>
-		<th class="tableData"><tmpl_var sunday.label></th>
-	<tmpl_else>
-		<th class="tableData"><tmpl_var sunday.label></th>
-		<th class="tableData"><tmpl_var monday.label></th>
-		<th class="tableData"><tmpl_var tuesday.label></th>
-		<th class="tableData"><tmpl_var wednesday.label></th>
-		<th class="tableData"><tmpl_var thursday.label></th>
-		<th class="tableData"><tmpl_var friday.label></th>
-		<th class="tableData"><tmpl_var saturday.label></th>
-	</tmpl_if>
-	</tr><tr>
-	<tmpl_loop prepad_loop>
-		<td>&nbsp;</td>
-	</tmpl_loop>
- 	<tmpl_loop day_loop>
-		<tmpl_if isStartOfWeek>
-			<tr>
-		</tmpl_if>
-		<td class="table<tmpl_if isToday>Today<tmpl_else>Data</tmpl_if>" valign="top" align="left"><p><b><tmpl_var day></b></p>
-		<tmpl_loop event_loop>
-			<tmpl_if name>
-				&middot;<a href="<tmpl_var url>"><tmpl_var name></a><br />
-			</tmpl_if>
-		</tmpl_loop>
-		</td>
-		<tmpl_if isEndOfWeek>
-			</tr>
-		</tmpl_if>
-	</tmpl_loop>
-	<tmpl_loop postpad_loop>
-		<td>&nbsp;</td>
-	</tmpl_loop>
-	</tr>
-	</table>
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> <tmpl_var pagination.pageList.upTo20> <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-
-
-~~~
-<style type="text/css">
-.pagination
-{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:100%;
-	text-align:center;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-
-.pagination a
-{
-	color:white;
-}
-
-.fontSettings
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-h2
-{
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-
-.calendarBig
-{
-	/*border:solid gray 1px;*/
-}
-
-.calendarBig .tableHeader
-{
-	text-align:center;
-	font-size:13pt;
-	letter-spacing:2px;
-	background-color:#DADADA;
-}
-
-.calendarBig .tableData
-{
-	width:14%;
-}
-
-.calendarBig .tableToday
-{
-	font-size:9pt;
-}	
-
-.calendarBig .tableToday a
-{
-	color:#29587E;
-}
-
-.calendarBig td
-{
-	border:solid silver 1px;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_calendar_month_small.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_calendar_month_small.tmpl
deleted file mode 100644
index f0820f4ab..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_calendar_month_small.tmpl
+++ /dev/null
@@ -1,143 +0,0 @@
-#PBtmpl0000000000000105
-<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 session.var.adminOn>
-	<a href="<tmpl_var addevent.url>"><tmpl_var addevent.label></a>
-	<p />
-</tmpl_if>
-
-<tmpl_loop month_loop>
-	<table border="0" class="calendarSmall">
-	<tr><td colspan=7 class="tableHeader"><tmpl_var month> <tmpl_var year></td></tr>
-	<tr>
-	<tmpl_if session.user.firstDayOfWeek>
-		<th class="tableData"><tmpl_var monday.label.short></th>
-		<th class="tableData"><tmpl_var tuesday.label.short></th>
-		<th class="tableData"><tmpl_var wednesday.label.short></th>
-		<th class="tableData"><tmpl_var thursday.label.short></th>
-		<th class="tableData"><tmpl_var friday.label.short></th>
-		<th class="tableData"><tmpl_var saturday.label.short></th>
-		<th class="tableData"><tmpl_var sunday.label.short></th>
-	<tmpl_else>
-		<th class="tableData"><tmpl_var sunday.label.short></th>
-		<th class="tableData"><tmpl_var monday.label.short></th>
-		<th class="tableData"><tmpl_var tuesday.label.short></th>
-		<th class="tableData"><tmpl_var wednesday.label.short></th>
-		<th class="tableData"><tmpl_var thursday.label.short></th>
-		<th class="tableData"><tmpl_var friday.label.short></th>
-		<th class="tableData"><tmpl_var saturday.label.short></th>
-	</tmpl_if>
-	</tr><tr>
-	<tmpl_loop prepad_loop>
-		<td>&nbsp;</td>
-	</tmpl_loop>
- 	<tmpl_loop day_loop>
-		<tmpl_if isStartOfWeek>
-			<tr>
-		</tmpl_if>
-		<td class="table<tmpl_if isToday>Today<tmpl_else>Data</tmpl_if>" valign="top" align="left"><p><b>
-				<tmpl_if hasEvents>
-					<a href="<tmpl_var url>"><tmpl_var day></a>
-				<tmpl_else>
-					<tmpl_var day>
-				</tmpl_if>
-		</b></p></td>
-		<tmpl_if isEndOfWeek>
-			</tr>
-		</tmpl_if>
-	</tmpl_loop>
-	<tmpl_loop postpad_loop>
-		<td>&nbsp;</td>
-	</tmpl_loop>
-	</tr>
-	</table>
-</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>
-
-
-~~~
-<style type="text/css">
-.pagination
-{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:330px;
-	text-align:center;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-
-.pagination a
-{
-	color:white;
-}
-
-.fontSettings
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-h2
-{
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-
-.calendarSmall
-{
-	width:330px;
-}
-
-.calendarSmall .tableHeader
-{
-	text-align:center;
-	font-size:13pt;
-	letter-spacing:2px;
-	background-color:#DADADA;
-}
-
-.calendarSmall .tableData
-{
-	width:14%;
-}
-
-.calendarSmall .tableToday
-{
-	font-size:9pt;
-	font-family:arial;
-	background-color:#DADADA;
-}	
-
-.calendarSmall .tableToday a
-{
-	color:#29587E;
-}
-
-.calendarSmall td
-{
-	border:solid silver 1px;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_center_image.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_center_image.tmpl
deleted file mode 100755
index 292f154a0..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_center_image.tmpl
+++ /dev/null
@@ -1,50 +0,0 @@
-#PBtmpl0000000000000084
-<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 pagination.isFirstPage>
-<tmpl_if image.url>
-	<div align="center"><img src="<tmpl_var image.url>" alt="<tmpl_var image.url>" border="0" /></div>
-</tmpl_if>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-	<p />
-</tmpl_if>
-
-<tmpl_if pagination.isLastPage>
-<tmpl_if linkurl>
-	<tmpl_if linktitle>
-		<p />
-		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
-	</tmpl_if>
-</tmpl_if>
-	<tmpl_if attachment.name><p><p style="display:inline;vertical-align:middle;"><a href="<tmpl_var attachment.url>"><img src="<tmpl_var attachment.icon>" style="vertical-align:middle;border: 0px;" alt="<tmpl_var attachment.name>" /> <tmpl_var attachment.name></a></p></p></tmpl_if>
-</tmpl_if>
-
-<tmpl_if pagination.pageCount.isMultiple>
-<tmpl_var pagination.previousPage>
-&#183;
-<tmpl_var pagination.pageList.upTo20>
-&#183;
-<tmpl_var pagination.nextPage>
-</tmpl_if>
-
-<tmpl_if pagination.isLastPage>
-<tmpl_if allowDiscussion>
-	<table width="100%" cellspacing="2" cellpadding="1" border="0">
-	<tr>
-	<td align="center" style="width:50%;" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
-	<td align="center" style="width:50%;" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td>
-	</tr>
-	</table>
-</tmpl_if>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_classifieds.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_classifieds.tmpl
deleted file mode 100755
index 2f44829ad..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_classifieds.tmpl
+++ /dev/null
@@ -1,70 +0,0 @@
-#PBtmpl0000000000000128
-<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>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&bull;
-	</tmpl_unless>
-	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-</p>
-
-
-<br />
-
-<tmpl_loop post_loop>
-	<div class="ad">
-		<div style="text-align: center;">
-			<b><a href="<tmpl_var url>"><tmpl_var title></a></b><br />
-			<tmpl_if user.isPoster>(<tmpl_var status>)</tmpl_if>
-			<tmpl_if thumbnail>
-				<div style="margin: 3px;">
-					<a href="<tmpl_var url>"><img src="<tmpl_var thumbnail>" alt="<tmpl_var thumbnail>" border="0" /></a>
-				</div>
-			</tmpl_if>
-		</div>
-		<tmpl_var synopsis>
-	</div>
-</tmpl_loop>
-
-<div style="clear: both;"></div>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-.ad {
-	border: 1px dotted #aaaaaa;
-	padding: 10px;
-	margin: 0px;
-	float: left;
-	width: 140px;
-	font-size: 12px;
-	height: 175px;
-	overflow: hidden;
-}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_cool_menus.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_cool_menus.tmpl
deleted file mode 100644
index 3fb229a67..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_cool_menus.tmpl
+++ /dev/null
@@ -1,231 +0,0 @@
-#PBtmpl0000000000000134
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-
-<script type="text/javascript">
-/*****************************************************************************
-Copyright (c) 2001 Thomas Brattli (webmaster@dhtmlcentral.com)
-
-DHTML coolMenus - Get it at coolmenus.dhtmlcentral.com
-Version 4.0_beta
-This script can be used freely as long as all copyright messages are
-intact.
-
-Extra info - Coolmenus reference/help - Extra links to help files ****
-CSS help: http://coolmenus.dhtmlcentral.com/projects/coolmenus/reference.asp?m=37
-General: http://coolmenus.dhtmlcentral.com/reference.asp?m=35
-Menu properties: http://coolmenus.dhtmlcentral.com/properties.asp?m=47
-Level properties: http://coolmenus.dhtmlcentral.com/properties.asp?m=48
-
-Background bar properties: http://coolmenus.dhtmlcentral.com/properties.asp?m=49
-Item properties: http://coolmenus.dhtmlcentral.com/properties.asp?m=50
-******************************************************************************/
-
-/***
-This is the menu creation code - place it right after you body tag
-Feel free to add this to a stand-alone js file and link it to your page.
-**/
-
-//Menu object creation
-coolmenu=new makeCM("coolmenu") //Making the menu object. Argument: menuname
-
-coolmenu.frames = 0
-
-//Menu properties
-coolmenu.onlineRoot=""
-coolmenu.pxBetween=2
-coolmenu.fromLeft=200	//200
-coolmenu.fromTop=100	//100
-coolmenu.rows=1
-coolmenu.menuPlacement="center"   //The whole menu alignment, left, center, or right
-
-coolmenu.resizeCheck=1
-coolmenu.wait=250
-coolmenu.fillImg="cm_fill.gif"
-coolmenu.zIndex=100
-
-//Background bar properties
-coolmenu.useBar=0
-coolmenu.barWidth="100%"
-coolmenu.barHeight="menu"
-coolmenu.barClass="cBar"
-coolmenu.barX=0
-coolmenu.barY=0
-coolmenu.barBorderX=0
-coolmenu.barBorderY=0
-coolmenu.barBorderClass=""
-
-//Level properties - ALL properties have to be spesified in level 0
-coolmenu.level[0]=new cm_makeLevel() //Add this for each new level
-coolmenu.level[0].width=110
-coolmenu.level[0].height=51
-coolmenu.level[0].regClass="cLevel0"
-coolmenu.level[0].overClass="cLevel0over"
-coolmenu.level[0].borderX=1
-coolmenu.level[0].borderY=1
-coolmenu.level[0].borderClass="cLevel0border"
-
-coolmenu.level[0].offsetX=0
-coolmenu.level[0].offsetY=0
-coolmenu.level[0].rows=0
-coolmenu.level[0].arrow=0
-coolmenu.level[0].arrowWidth=0
-coolmenu.level[0].arrowHeight=0
-coolmenu.level[0].align="bottom"
-
-//EXAMPLE SUB LEVEL[1] PROPERTIES - You have to specify the properties you want different from LEVEL[0] - If you want all items to look the same just remove this
-coolmenu.level[1]=new cm_makeLevel() //Add this for each new level (adding one to the number)
-coolmenu.level[1].width=coolmenu.level[0].width+20
-coolmenu.level[1].height=25
-coolmenu.level[1].regClass="cLevel1"
-coolmenu.level[1].overClass="cLevel1over"
-coolmenu.level[1].borderX=1
-coolmenu.level[1].borderY=1
-coolmenu.level[1].align="right"
-coolmenu.level[1].offsetX=0
-coolmenu.level[1].offsetY=0
-coolmenu.level[1].borderClass="cLevel1border"
-
-//EXAMPLE SUB LEVEL[2] PROPERTIES - You have to specify the properties you want different from LEVEL[1] OR LEVEL[0] - If you want all items to look the same just remove this
-coolmenu.level[2]=new cm_makeLevel() //Add this for each new level (adding one to the number)
-coolmenu.level[2].width=coolmenu.level[0].width+20
-coolmenu.level[2].height=25
-coolmenu.level[2].offsetX=0
-coolmenu.level[2].offsetY=0
-coolmenu.level[2].regClass="cLevel2"
-coolmenu.level[2].overClass="cLevel2over"
-coolmenu.level[2].borderClass="cLevel2border"
-
-//EXAMPLE SUB LEVEL[2] PROPERTIES - You have to specify the properties you want different from LEVEL[1] OR LEVEL[0] - If you want all items to look the same just remove this
-coolmenu.level[3]=new cm_makeLevel() //Add this for each new level (adding one to the number)
-coolmenu.level[3].width=coolmenu.level[0].width+20
-coolmenu.level[3].height=25
-coolmenu.level[3].offsetX=0
-coolmenu.level[3].offsetY=0
-coolmenu.level[3].regClass="cLevel2"
-coolmenu.level[3].overClass="cLevel2over"
-coolmenu.level[3].borderClass="cLevel2border"
-
-<tmpl_loop page_loop>
-coolmenu.makeMenu('coolmenu_<tmpl_var page.assetId escape=JS>'.replace(/\-/g,"a"),'coolmenu_<tmpl_var page.parent.assetId escape=JS>'.replace(/\-/g,"a"),"<tmpl_var page.menuTitle escape=JS>",'<tmpl_var page.url escape=JS>'<tmpl_if page.newWindow>,'_blank'</tmpl_if>);
-</tmpl_loop>
-
-coolmenu.construct();
-
-</script>
-~~~
-<style type="text/css">
-/* CoolMenus 4 - default styles - do not edit */
-.cCMAbs {
-	position: absolute;
-	visibility: hidden;
-	left: 0;
-	top: 0;
-}
-/* CoolMenus 4 - default styles - end */
-
-/*Styles for level 0*/
-.cLevel0,.cLevel0over {
-	position: absolute;
-	padding: 2px;
-	font-family: tahoma, arial, helvetica;
-	font-size: 12px;
-	font-weight: bold;
-}
-
-.cLevel0 {
-	background-color: navy;
-	layer-background-color: navy;
-	color: white;
-	text-align: center;
-}
-
-.cLevel0over {
-	background-color: orange;
-	layer-background-color: navy;
-	color: white;
-	cursor: pointer;
-	cursor: hand;
-	text-align: center;
-}
-
-.cLevel0border {
-	position: absolute;
-	visibility: hidden;
-	background-color: #569635;
-	layer-background-color: #006699;
-}
-
-/*Styles for level 1*/
-.cLevel1, .cLevel1over {
-	position: absolute;
-	padding: 2px;
-	font-family: tahoma, arial, helvetica;
-	font-size: 11px;
-	font-weight:bold;
-}
-
-.cLevel1 {
-	background-color: navy;
-	layer-background-color: navy;
-	color: white;
-}
-
-.cLevel1over {
-	background-color: #336699;
-	layer-background-color: #336699;
-	color: yellow;
-	cursor: pointer;
-	cursor: hand;
-}
-
-.cLevel1border {
-	position: absolute;
-	visibility: hidden;
-	background-color: #006699;
-	layer-background-color: #006699;
-}
-
-/*Styles for level 2*/
-.cLevel2, .cLevel2over {
-	position: absolute;
-	padding: 2px;
-	font-family: tahoma, arial, helvetica;
-	font-size: 10px;
-	font-weight: bold;
-}
-
-.cLevel2 {
-	background-color: navy;
-	layer-background-color: navy;
-	color:white;
-}
-
-.cLevel2over {
-	background-color: #0099cc;
-	layer-background-color: #0099cc;
-	color: yellow;
-	cursor:pointer;
-	cursor:hand;
-}
-
-.cLevel2border {
-	position: absolute;
-	visibility: hidden;
-	background-color: #006699;
-	layer-background-color: #006699;
-}
-
-</style>
-<script src="^Extras(coolmenus/coolmenus4.js);" type="text/javascript"></script>
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_crumbtrail.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_crumbtrail.tmpl
deleted file mode 100644
index d694b40bc..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_crumbtrail.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-#PBtmpl0000000000000093
-		<tmpl_if displayTitle>
-		<h2><tmpl_var title></h2>
-		</tmpl_if>
-		<tmpl_if description>
-			<p><tmpl_var description></p>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-<tmpl_var controls>
-</tmpl_if>
-<span class="crumbTrail">
-<tmpl_loop page_loop>
-<a class="crumbTrail" 
-    <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
-   <tmpl_unless "__last__"> &gt; </tmpl_unless>
-</tmpl_loop>
-</span>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_dashboard-default-view-template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_dashboard-default-view-template.tmpl
deleted file mode 100644
index b043414f6..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_dashboard-default-view-template.tmpl
+++ /dev/null
@@ -1,124 +0,0 @@
-#DashboardViewTmpl00001
-<div id="dashboardContainer" style="background-color:white;">
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>">
-</a>
-<table id="dashboardChooserContainer" width="100%" border="0">
-<tr>
-<td id="leftBox">
-<div style="display:none;cursor: hand;" id="hideNewContentButton" onclick="makeInactive(this);makeInactive(document.getElementById('availableBox'));makeActive(document.getElementById('showNewContentButton'));">Hide New Content List</div>
-<div id="availableBox"><div id="availableBox2">
-<div id="availableDashlets">
-<table cellpadding="0" cellspacing="0" border="0" id="position1" class="dashboardColumn">
-<tbody class="availableDashlet">
-<tmpl_loop position1_loop><tr id="td<tmpl_var id>"><td><div id="td<tmpl_var id>_div" class="dragable"><div class="dragTrigger"><div class="dragTitle"><span class="headerTitle" id="hdrtd<tmpl_var id>_span"><tmpl_var dashletTitle></span><span class="options" onmouseover="this.className='options optionsHoverIE'" onmouseout="this.className='options'"><tmpl_if canEditUserPrefs><a onclick="dashboard_toggleEditForm(event,'<tmpl_var id>','<tmpl_var shortcutUrl>')"><img src="^Extras(wobject/Dashboard/edit_btn.jpg);" style="border-style:none;" alt="" /></a></tmpl_if><a onclick="dragable_deleteContent(event,this<tmpl_if canPersonalize>,'true'</tmpl_if>);this.parentNode.onmouseout();"><img src="^Extras(wobject/Dashboard/delete_btn.jpg);" style="border-style:none;" alt="" /></a><tmpl_if showReloadIcon><a onclick="dashboard_reloadDashlet(event,'<tmpl_var id>','<tmpl_var shortcutUrl>')"><img src="^Extras(wobject/Dashboard/reload.gif);" style="border-style:none;" alt="" /></a></tmpl_if><br /></span></div></div>
-<div class="content" id="ct<tmpl_var id>_div"><tmpl_var content></div></div></td></tr></tmpl_loop>
-</tbody></table>
-</div></div></div>
-</td>
-<td id="rightBox">
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr><td style="width:80px;">			<div id="showNewContentButton"  onclick="makeInactive(this);makeActive(document.getElementById('availableBox'));makeActive(document.getElementById('hideNewContentButton'));">Add New Content</div></td><td>
-<tmpl_if showAdmin>
-<p>
-<tmpl_var controls>
-</p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-<h2 style="text-align:center">
-<tmpl_var title>
-</h2>
-</tmpl_if>
-
-
-
-<tmpl_if description>
-<p>
-<tmpl_var description>
-</p>
-</tmpl_if>
-</td><td valign="top" class="login">^L("17","","PBtmpl0000000000000092"); ^AdminToggle(Modify the Default User's Perspective,Leave Default User Perspective (Admin Mode));</td></tr></table>
-<script type="text/javascript" src="^Extras(js/at/AjaxRequest.js);"></script>
-<script type="text/javascript">
-function submitForm(theform,idToReplace,shortcutUrl) {
-
-var status = AjaxRequest.submit(
-theform
-,{
-'parameters':{
-},
-'onSuccess':function(req){
-var myArray = req.responseText.split(/beginDebug/mg,1);
-document.getElementById("ct" + idToReplace + "_div").innerHTML = myArray[0];
-var existingForm = document.getElementById("form" + idToReplace + "_div");
-throwAway = existingForm.parentNode.removeChild(existingForm);
-var hoopla = AjaxRequest.get(
-		{
-			'url':shortcutUrl
-			,'parameters':{
-				'func':"getNewTitle"
-			}
-			,'onSuccess':function(req){
-				var myArr557 = req.responseText.split(/beginDebug/mg,1);
-				document.getElementById("hdrtd" + idToReplace + "_span").innerHTML = myArr557[0];
-			}
-		}
-	);
-	}
-	}
-);
-return status;
-	}
-function makeActive(o) { o.style.display = "inline"; }
-function makeInactive(o) { o.style.display = "none"; }
-function AjaxRequestBegin() {  }
-function AjaxRequestEnd() {  }
-</script>
-<div id="columnsContainerDiv">
-<table cellpadding="0" cellspacing="8" border="0" id="columnsContainerTable" width="100%">
-<tr>
-<td style="width:33%;">
-<table cellpadding="0" cellspacing="0" border="0" id="position2" class="dashboardColumn" width="100%">
-<tbody>
-	<tmpl_loop position2_loop><tr id="td<tmpl_var id>"><td><div id="td<tmpl_var id>_div" class="dragable"><div class="dragTrigger"><div class="dragTitle"><span class="headerTitle" id="hdrtd<tmpl_var id>_span"><tmpl_var dashletTitle></span></span><span class="options" onmouseover="this.className='options optionsHoverIE'" onmouseout="this.className='options'"><tmpl_if canEditUserPrefs><a onclick="dashboard_toggleEditForm(event,'<tmpl_var id>','<tmpl_var shortcutUrl>')"><img src="^Extras(wobject/Dashboard/edit_btn.jpg);" style="border-style:none;" alt="" /></a></tmpl_if><a onclick="dragable_deleteContent(event,this<tmpl_if canPersonalize>,'true'</tmpl_if>);this.parentNode.onmouseout();"><img src="^Extras(wobject/Dashboard/delete_btn.jpg);" style="border-style:none;" alt="" /></a><tmpl_if showReloadIcon><a onclick="dashboard_reloadDashlet(event,'<tmpl_var id>','<tmpl_var shortcutUrl>')"><img src="^Extras(wobject/Dashboard/reload.gif);" style="border-style:none;" alt="" /></a></tmpl_if><br /></span></div></div>
-	<div class="content" id="ct<tmpl_var id>_div"><tmpl_var content></div></div></td></tr></tmpl_loop>
-</tbody>
-</table>
-</td>
-<td style="height:500px;background-color:gray;width:2px;">
-</td>
-<td style="width:33%;">
-<table cellpadding="0" cellspacing="0" border="0" id="position3" class="dashboardColumn" width="100%">
-<tbody>
-<tmpl_loop position3_loop><tr id="td<tmpl_var id>"><td><div id="td<tmpl_var id>_div" class="dragable"><div class="dragTrigger"><div class="dragTitle"><span class="headerTitle"><span class="headerTitle" id="hdrtd<tmpl_var id>_span"><tmpl_var dashletTitle></span></span><span class="options" onmouseover="this.className='options optionsHoverIE'" onmouseout="this.className='options'"><tmpl_if canEditUserPrefs><a onclick="dashboard_toggleEditForm(event,'<tmpl_var id>','<tmpl_var shortcutUrl>')"><img src="^Extras(wobject/Dashboard/edit_btn.jpg);" style="border-style:none;" alt="" /></a></tmpl_if><a onclick="dragable_deleteContent(event,this<tmpl_if canPersonalize>,'true'</tmpl_if>);this.parentNode.onmouseout();"><img src="^Extras(wobject/Dashboard/delete_btn.jpg);" style="border-style:none;" alt="" /></a><tmpl_if showReloadIcon><a onclick="dashboard_reloadDashlet(event,'<tmpl_var id>','<tmpl_var shortcutUrl>')"><img src="^Extras(wobject/Dashboard/reload.gif);" style="border-style:none;" alt="" /></a></tmpl_if><br /></span></div></div>
-<div class="content" id="ct<tmpl_var id>_div"><tmpl_var content></div></div></td></tr></tmpl_loop>
-</tbody>
-</table>
-</td>
-<td style="height:500px;background-color:gray;width:2px;"></td>
-<td style="width:33%;">
-<table cellpadding="0" cellspacing="0" border="0" id="position4" class="dashboardColumn" width="100%">
-<tbody>
-<tmpl_loop position4_loop><tr id="td<tmpl_var id>"><td><div id="td<tmpl_var id>_div" class="dragable"><div class="dragTrigger"><div class="dragTitle"><span class="headerTitle"><span class="headerTitle" id="hdrtd<tmpl_var id>_span"><tmpl_var dashletTitle></span></span><span class="options" onmouseover="this.className='options optionsHoverIE'" onmouseout="this.className='options'"><tmpl_if canEditUserPrefs><a onclick="dashboard_toggleEditForm(event,'<tmpl_var id>','<tmpl_var shortcutUrl>')"><img src="^Extras(wobject/Dashboard/edit_btn.jpg);" style="border-style:none;" alt="" /></a></tmpl_if><a onclick="dragable_deleteContent(event,this<tmpl_if canPersonalize>,'true'</tmpl_if>);this.parentNode.onmouseout();"><img src="^Extras(wobject/Dashboard/delete_btn.jpg);" style="border-style:none;" alt="" /></a><tmpl_if showReloadIcon><a onclick="dashboard_reloadDashlet(event,'<tmpl_var id>','<tmpl_var shortcutUrl>')"><img src="^Extras(wobject/Dashboard/reload.gif);" style="border-style:none;" alt="" /></a></tmpl_if><br /></span></div></div>
-<div class="content" id="ct<tmpl_var id>_div"><tmpl_var content></div></div></td></tr></tmpl_loop>
-</tbody>
-</table>
-</td>
-</tr>
-</table>
-</div>
-<table class="blankTable"><tr id="blank" class="hidden"><td class="blankColumn"><div><div class="empty">&nbsp;</div></div></td></tr></table>
-<tmpl_var dragger.init>
-</td></tr></table></div>
-~~~
-<style type="text/css"> @import "^Extras(wobject/Dashboard/draggable.css);"; </style>
-<style type="text/css"> @import "^Extras(wobject/Dashboard/dashboard.css);"; </style>
-<script src="^Extras(wobject/Dashboard/draggable.js);" type="text/javascript"></script>
-<!--[if IE]>
-<style type="text/css">
-div.dragTitle
-{
-	overflow-x:hidden;
-}
-</style>
-<![endif]-->
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_data_list.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_data_list.tmpl
deleted file mode 100644
index 6e5baedbf..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_data_list.tmpl
+++ /dev/null
@@ -1,27 +0,0 @@
-#PBtmpl0000000000000021
-<a href="<tmpl_var back.url>"><tmpl_var back.label></a>
-<tmpl_if session.var.adminOn>
-<p><tmpl_var controls></p>
-</tmpl_if><p />
-<table width="100%">
-<tr>
-<td class="tableHeader">Entry ID</td>
-<tmpl_loop field_loop>
-  <tmpl_unless field.isMailField>
-    <td class="tableHeader"><tmpl_var field.label></td>
-  </tmpl_unless field.isMailField>
-</tmpl_loop field_loop>
-<td class="tableHeader">Submission Date</td>
-</tr>
-<tmpl_loop record_loop>
-<tr>
-  <td class="tableData"><a href="<tmpl_var record.edit.url>"><tmpl_var record.entryId></a></td>
-  <tmpl_loop record.data_loop>
-    <tmpl_unless record.data.isMailField>
-       <td class="tableData"><tmpl_var record.data.value></td>
-     </tmpl_unless record.data.isMailField>
-  </tmpl_loop record.data_loop>
-  <td class="tableData"><tmpl_var record.submissionDate.human></td>
-</tr>
-</tmpl_loop record_loop>
-</table>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_acknowledgement.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_acknowledgement.tmpl
deleted file mode 100644
index fe0a47b66..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_acknowledgement.tmpl
+++ /dev/null
@@ -1,41 +0,0 @@
-#PBtmpl0000000000000104
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<div class="acknowledgement">
-	<tmpl_var acknowledgement>
-</div>
-
-<table border="0" class="acknowledgement">
-<tmpl_loop field_loop>
-<tmpl_unless field.isMailField><tmpl_unless field.isHidden>
-	<tr><td class="tableHeader"><tmpl_var field.label></td>
-	<td class="tableData"><tmpl_var field.value></td></tr>
-</tmpl_unless></tmpl_unless>
-</tmpl_loop>
-</table>
-<p />
-<a href="<tmpl_var back.url>" class="backLabel"><tmpl_var back.label></a>
-
-
-~~~
-<style type="text/css">
-.acknowledgement
-{
-	margin-top:5px;
-}
-.acknowledgement td
-{
-	font-size:9pt;
-	font-family:arial;
-}
-
-a.blackLabel
-{
-	color:#29587E;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_article.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_article.tmpl
deleted file mode 100755
index 6267e95fc..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_article.tmpl
+++ /dev/null
@@ -1,57 +0,0 @@
-#PBtmpl0000000000000002
-<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 pagination.isFirstPage>
-<tmpl_if image.url>
-	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td class="content">
-	<img src="<tmpl_var image.url>" align="right" border="0" alt="<tmpl_var image.url>" />
-</tmpl_if>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<tmpl_if pagination.isLastPage>
-	<tmpl_if linkUrl>
-	<tmpl_if linkTitle>
-		<p />
-		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
-	</tmpl_if>
-	</tmpl_if>
-	<tmpl_if attachment.name><p><p style="display:inline;vertical-align:middle;"><a href="<tmpl_var attachment.url>"><img src="<tmpl_var attachment.icon>" style="vertical-align:middle;border: 0px;" alt="<tmpl_var attachment.name>" /> <tmpl_var attachment.name></a></p></p></tmpl_if>
-</tmpl_if>
-
-<tmpl_if pagination.pageCount.isMultiple>
-<tmpl_var pagination.previousPage>
-&#183;
-<tmpl_var pagination.pageList.upTo20>
-&#183;
-<tmpl_var pagination.nextPage>
-</tmpl_if>
-
-<tmpl_if pagination.isFirstPage>
-<tmpl_if image.url>
-	</td></tr></table>
-</tmpl_if>
-</tmpl_if>
-
-<tmpl_if pagination.isLastPage>
-<tmpl_if allowDiscussion>
-	<p>
-	<table width="100%" cellspacing="2" cellpadding="1" border="0">
-	<tr>
-	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
-	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td>
-	</tr>
-	</table>
-</tmpl_if>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_checkout_confirmation_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_checkout_confirmation_template.tmpl
deleted file mode 100644
index 3a993bd4c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_checkout_confirmation_template.tmpl
+++ /dev/null
@@ -1,59 +0,0 @@
-#PBtmpl0000000000000016
-<a href="<tmpl_var viewShoppingCart.url>"><tmpl_var viewShoppingCart.label></a> &middot;
-<a href="<tmpl_var changePayment.url>"><tmpl_var changePayment.label></a>
-<tmpl_if hasMultipleShipping>&middot;<a href="<tmpl_var changeShipping.url>"><tmpl_var changeShipping.label></a></tmpl_if>
-<br />
-<br>
-
-<tmpl_var title><br>
-<ul>
-<tmpl_loop errorLoop>
-<li><tmpl_var message></li>
-</tmpl_loop>
-</ul>
-
-<table> <tr align="left">
-      <th style="border-bottom: 2px solid black">Product</th>
-      <th style="border-bottom: 2px solid black">Quantity</th>
-      <th style="border-bottom: 2px solid black">Price</th>
-      <th style="border-bottom: 2px solid black">Each</th>
-  </tr>
-
-  <tmpl_if normalItems>
-  </tmpl_if>
-
-  <tmpl_loop normalItemsLoop>
-  <tr>
-      <td align="left"><tmpl_var name></td>
-      <td align="center"><tmpl_var quantity></td>
-      <td align="right"><tmpl_var totalPrice></td>
-  </tr>
-  </tmpl_loop>
-
-  <tmpl_loop recurringItemsLoop>
-  <tr>
-      <td align="left"><tmpl_var name></td>
-      <td align="center"><tmpl_var quantity></td>
-      <td align="right"><tmpl_var totalPrice></td>
-      <td align="left"><tmpl_var period></td>
-  </tr>
-</tmpl_loop>
-  <tr style="border-top: 1px solid black">
-      <td style="border-top: 1px solid black">&nbsp;</td>
-      <td align="right" style="border-top: 1px solid black"><b>Subtotal</b></td>
-      <td align="right" style="border-top: 1px solid black"><b><tmpl_var subtotal></b></td>
-  </tr>
-  <tr>
-      <td colspan="2" align="right">Shipping</td>
-      <td align="right"><tmpl_var shippingCost></td>
-  </tr>
-  <tr>
-      <td colspan="2" align="right" style="border-top: 1px solid black"><b>Total</b></td>
-      <td align="right" style="border-top: 1px solid black"><b><tmpl_var total></b></td>
-  </tr>
-
-</table>
-
-<br /><br />
-
-<tmpl_var form>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_data_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_data_form.tmpl
deleted file mode 100644
index 538bb9892..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_data_form.tmpl
+++ /dev/null
@@ -1,103 +0,0 @@
-#PBtmpl0000000000000141
-<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 error_loop>
-	<ul class="errors">
-		<tmpl_loop error_loop>
-			<li><b><tmpl_var error.message></b></li>
-		</tmpl_loop>
-	</ul>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-	<p />
-</tmpl_if>
-
-<tmpl_if canEdit>
-	<div class="dataControls">
-		<a href="<tmpl_var entryList.url>"><tmpl_var entryList.label></a>
-		&bull; <a href="<tmpl_var export.tab.url>"><tmpl_var export.tab.label></a>
-		<tmpl_if entryId>
-			&bull; <a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-			&bull; <a href="<tmpl_var addField.url>"><tmpl_var addField.label></a>
-			&bull; <a href="<tmpl_var addTab.url>"><tmpl_var addTab.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_if>
-<tmpl_var form.start>
-<table class="defaultData">
-        <tmpl_loop field_loop>
-                <tmpl_unless field.isHidden>
-                        <tr>
-                                <td class="formDescription" valign="top">
-                                        <tmpl_if session.var.adminOn>
-                                                <tmpl_if canEdit>
-                                                        <tmpl_var field.controls>
-                                                </tmpl_if>
-                                        </tmpl_if>
-                                        <tmpl_var field.label>
-                                </td>
-                                <td class="tableData" valign="top">
-                                        <tmpl_if field.isDisplayed>
-                                                <tmpl_var field.value>
-                                        <tmpl_else>
-                                                <tmpl_var field.form>
-                                        </tmpl_if>
-                                        <tmpl_if field.isRequired>*</tmpl_if>
-                                        <span class="formSubtext">
-                                                <br />
-                                                <tmpl_var field.subtext>
-                                        </span>
-                                </td>
-                        </tr>
-                </tmpl_unless>
-        </tmpl_loop>
-</table>
-<br />
-<tmpl_var form.save>
-<tmpl_var form.end>
-
-
-~~~
-<style type="text/css">
-h2{
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.errors{
-	font-family:arial;
-	font-size:9pt;
-}
-.defaultData td{
-	font-family:arial;
-	font-size:9pt;
-}
-.dataControls
-{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-
-.dataControls a
-{
-	color:white;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_edit_profile_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_edit_profile_template.tmpl
deleted file mode 100644
index b0c42ac1a..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_edit_profile_template.tmpl
+++ /dev/null
@@ -1,55 +0,0 @@
-#PBtmpl0000000000000051
-<h2><tmpl_var displayTitle></h2>
-
-<tmpl_if profile.message>
-   <tmpl_var profile.message>
-</tmpl_if>
-
-<tmpl_var profile.form.header>
-<tmpl_var profile.form.hidden>
-<table >
-<tmpl_loop profile.form.elements>
-     <tr>
-       <td class="tableHeader" valign="top" colspan="2">
-         <tmpl_var profile.form.category>
-       </td>
-     </tr>
- 
- <tmpl_loop profile.form.category.loop>
-   <tr>
-    <td class="formDescription" valign="top">
-      <tmpl_var profile.form.element.label>
-    </td>
-    <td class="tableData">
-      <tmpl_var profile.form.element>
-      <tmpl_if profile.form.element.subtext>
-        <span class="formSubtext">
-         <tmpl_var profile.form.element.subtext>
-        </span>
-      </tmpl_if>
-    </td>
-   </tr>
- </tmpl_loop>
-</tmpl_loop>
-<tmpl_loop create.form.profile>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var profile.formElement.label></td>
-   <td class="tableData"><tmpl_var profile.formElement></td>
-</tr>
-</tmpl_loop>
-<tr>
- <td class="formDescription" valign="top"></td>
- <td class="tableData">
-     <tmpl_var profile.form.submit>
- </td>
-</tr>
-</table>
-<tmpl_var profile.form.footer>
-
-<div class="accountOptions">
-   <ul>
-      <tmpl_loop profile.accountOptions>
-         <li><tmpl_var options.display></li>
-      </tmpl_loop>
-   </ul>
-</div>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_checkout.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_checkout.tmpl
deleted file mode 100644
index a751a22d3..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_checkout.tmpl
+++ /dev/null
@@ -1,112 +0,0 @@
-#EventManagerTmpl000003
-#title:Default Event Management System Checkout
-#menuTitle:Default Event Management System Checkout
-#url:default-ems-template-checkout
-#namespace:EventManagementSystem_checkout
-#create
-<tmpl_if resolveConflicts>
-<tmpl_var form.header>
-<table width="100%" border="0">
-<tr><td><tmpl_var message></td></tr>
-
-<tr>
-	<td>
-		<table width="100%">
- <tmpl_loop conflict_loop>
-		<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>>
-			<td><tmpl_var form.deleteControl></td>
-			<td><tmpl_var title></td>
-			<td><tmpl_var description></td>
-			<td><tmpl_var price></td>
-		</tr>
- </tmpl_loop>
-		</table>
-	</td>
-</tr> 
-<tr><td><tmpl_var form.submit></td></tr>
-</table>
-<tmpl_var form.footer>
-</tmpl_if>
-
-
-
-
-<tmpl_if registration>
-  <tmpl_var form.header>
-  <tmpl_var form.message>
-  <tmpl_var form.chooserJS>
-  <table style="border-top:solid gray 1px;width:100%;margin-top:5px;">
-  <tr><td><tmpl_var form.chooser.label></td><td><tmpl_var form.chooser></td></tr>
-  <tr><td><tmpl_var form.firstName.label></td><td><tmpl_var form.firstName></td></tr>
-<tr><td><tmpl_var form.lastName.label></td><td><tmpl_var form.lastName></td></tr>
-<tr><td><tmpl_var form.address.label></td><td><tmpl_var form.address></td></tr>
-<tr><td><tmpl_var form.city.label></td><td><tmpl_var form.city></td></tr>
-<tr><td><tmpl_var form.state.label></td><td><tmpl_var form.state></td></tr>
-<tr><td><tmpl_var form.zipcode.label></td><td><tmpl_var form.zipcode></td></tr>
-<tr><td><tmpl_var form.country.label></td><td><tmpl_var form.country></td></tr>
-<tr><td><tmpl_var form.phoneNumber.label></td><td><tmpl_var form.phoneNumber></td></tr>
-<tr><td><tmpl_var form.email.label></td><td><tmpl_var form.email></td></tr>
-<tr><td><tmpl_var form.badgeId.label></td><td><tmpl_var form.badgeId></td></tr>
-<tr><td colspan="2"><br /><tmpl_var form.submit></td></tr>
-</table>
-<script type="text/javascript">
-
-function swapBadgeInfo(badgeId) {
-	var selector = document.getElementById('badgeId_formId');
-	for (var i in badges[badgeId]) {
-		var field = document.getElementById(i+'_formId');
-		if (field && badges[badgeId][i]) {
-			field.value=badges[badgeId][i];
-		} else {
-			if (field) field.value='';
-		}
-	}
-}	
-
-var selector1 = document.getElementById('badgeId_formId');
-if (selector1) {
-	swapBadgeInfo(selector1.value);
-}
-
-</script>
-<tmpl_var form.footer>
-</tmpl_if>
-
-<tmpl_if prereqsAreMissing>
-<tmpl_var form.header>
-<table border="1">
-
-<tmpl_loop message_loop>
-<tr>
-	<td colspan="4"><strong><tmpl_var title> requires all of the following:</strong></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<ul>
-<tmpl_loop messageLoop>
-			<li><tmpl_var reqmessage></li>
-</tmpl_loop>
-		</ul>
-	</td>
-</tr>
-</tmpl_loop>
-
-<tmpl_loop missingEvents_loop>
-<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>><td><tmpl_var form.checkBox></td><td><tmpl_var title></td><td><tmpl_var description></td><td><tmpl_var price></td></tr>
-</tmpl_loop>
-<tr><td colspan="4"><br /><tmpl_var form.submit></td></tr>
-</table>
-<tmpl_var form.footer>
-
-</tmpl_if>
-~~~
-<style type="text/css">
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_manage_purchases.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_manage_purchases.tmpl
deleted file mode 100644
index 2a7438550..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_manage_purchases.tmpl
+++ /dev/null
@@ -1,38 +0,0 @@
-#EventManagerTmpl000004
-#title:Default Event Management System Manage Purchases
-#menuTitle:Default Event Management System Manage Purchases
-#url:default-ems-template-manage-purchases
-#namespace:EventManagementSystem_managePurchas
-#create
-<tmpl_if session.var.adminOn>
-        <p><tmpl_var controls></p><br /><br />
-</tmpl_if>
-<h2><tmpl_var managePurchasesTitle></h2>
-<table width="100%" cellspacing="0" cellpadding="2">
-<tr>
-	<td><tmpl_var purchaseId.label></td>
-	<td><tmpl_var datePurchasedHuman.label></td>
-</tr>
-<tmpl_if purchasesLoop>
-	<tmpl_loop purchasesLoop>
-	<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>>
-		<td><strong><tmpl_var __COUNT__></strong></td>
-		<td>&nbsp;<a href="<tmpl_var purchaseUrl>"><tmpl_var purchaseId></a></td>
-		<td>&nbsp;<tmpl_var datePurchasedHuman></td>
-	</tr>
-	</tmpl_loop>
-<tmpl_else>
-<tr>
-	<td><tmpl_var noPurchasesMessage></td>
-</tr>
-</tmpl_if>
-</table>
-~~~
-<style type="text/css">
-tr.oddRow td {
-	background-color:#DADADA;	
-}
-tr.evenRow td {
-	background-color:#E8E8E8;	
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl
deleted file mode 100644
index 36d3acce4..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl
+++ /dev/null
@@ -1,230 +0,0 @@
-#EventManagerTmpl000006
-#create
-#title:Default Event Management System Search
-#menuTitle:Default Event Management System Search
-#url:default-ems-search-template
-#namespace:EventManagementSystem_search
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-        <p><tmpl_var controls></p><br /><br />
-</tmpl_if>
-<ul>
-<tmpl_if canManageEvents>
-   <li><a href='<tmpl_var addEvent.url>'><tmpl_var addEvent.label></a></li>
-   <li><a href='<tmpl_var manageEvents.url>'><tmpl_var manageEvents.label></a></li>
-</tmpl_if>
-<li><a href='<tmpl_var managePurchases.url>'><tmpl_var managePurchases.label></a></li>
-</ul>
-<tmpl_var calendarJS>
-<tmpl_unless noSearchDialog>
-<script type="text/javascript" src="<tmpl_var ems.wobject.dir>/script/dynamicForms.js"></script>
-<script type="text/javascript">
-   <tmpl_var search.filters.options>
-   var advanced = 0;
-   var filterCount = 0;
-
-	function setSelectValue(selObj,newValue) {
-		for (var i=0; i<selObj.options.length; i++) {
-			selObj.options[i].selected = (selObj.options[i].value==newValue)?true:false;
-		}
-	}
-	
-   function toggleAdvanced() {
-      var ids = ["cParams","cResults","cSearch"];
-	  var toggle = "";
-	  for (var i = 0; i < ids.length; i++) {
-	     if(advanced == 1) {
-		    toggle = "none";
-		 }
-		 document.getElementById(ids[i]).style.display=toggle;
-	  }
-	  advanced = (advanced == 1)?0:1;
-	  return false;
-   }
-   
-   function toggleTitle(obj) {
-      if (obj.checked) {
-	     document.getElementById('cs_search_title_td').style.display='inline';
-	  } else {
-	     document.getElementById('cs_search_title_td').style.display='none';
-	  }
-   }
-   
-   function openWin (url, name, param) {
-      var newwin = window.open(url, name, param);
-      newwin.focus();
-   }
-   
-   function buildFilterList() {
-      return "Custom Filter";
-   }
-   
-   function stripDelim(value,delim) {
-      value = value.replace(/delim/g,"");
-	  return value;
-   }
-
-	function unset(array, valueToUnset){
-		var output=new Array(0);
-		for(var i in array){
-			if(i==valueToUnset){continue;}
-			output[i]=array[i];
-		}
-		return output;
-	}
-	function advSearch() {
-		var mee = document.getElementById('basicSearch')
-		if (mee) mee.style.display='none';
-		var pee = document.getElementById('advSearchDiv');
-		if (pee) pee.style.display='block';
-	}
-	function basicSearch() {
-		var vee = document.getElementById('basicSearch');
-		if (vee) vee.style.display='block';
-		var dee = document.getElementById('advSearchDiv');
-		if (dee) dee.style.display='none';
-	}
-</script>
-
-<div id="basicSearch">
-<tmpl_var advSearch.formHeader>
-<table width="100%" border="0" padding="1" style="border-bottom:double gray 5px;border-top:solid gray 1px;margin-bottom:5px;margin-top:5px;">
-   <tbody id="filterbody">
-   <tr>
-      <td style="font-weight:bold;width:40%;">Search Keywords:</td>
-	  <td style="width:60%;"><input name="searchKeywords" style="width:100%;" /></td>
-   </tr>
-   
-   </tbody>
-</table>
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-	<td align="left"><tmpl_var search.formSubmit></td>
-	<td align="right" valign="top"><a href="javascript:void(addField())">Add a custom filter</a></td>
-</tr>
-</table>
-<tmpl_var search.formFooter>
-</div>
-
-</tmpl_unless>
-<br /><br />
-
-<tmpl_if managePrereqs><p><tmpl_var managePrereqsMessage></p><tmpl_var prereqForm.header></tmpl_if>
-<p><tmpl_var message></p>
-<p>Your search returned <tmpl_var numberOfSearchResults> results.</p>
-<p><tmpl_var addToBadgeMessage></p>
-
-<table width="100%" border="0" cellpadding="8" cellspacing="0" style="border-top:solid gray 2px;border-bottom:solid gray 2px;">
-<tr>
-<tmpl_if managePrereqs><th>&nbsp;</th></tmpl_if>
-<th><tmpl_var name.label></th>
-<th><tmpl_var starts.label></th>
-<th><tmpl_var ends.label></th>
-<th><tmpl_var seats.label></th>
-<th><tmpl_var price.label></th>
-<th><tmpl_var requirement.label></th>
-<th><tmpl_var addToCart.label></th></tr>
-<tmpl_loop events_loop>
-  <tr<tmpl_unless __ODD__> class="oddRow"<tmpl_else> class="evenRow"</tmpl_unless>>
-
-  <tmpl_if managePrereqs><td><tmpl_var prereqForm.checkbox></td></tmpl_if>
-  <td nowrap><tmpl_if canManageEvents><tmpl_var manageToolbar>&nbsp;</tmpl_if><tmpl_var title>
-  </td><td><tmpl_var startDate.human>
-  </td><td><tmpl_var endDate.human>
-  </td><td><tmpl_var seatsRemaining>
-  </td><td><tmpl_var price>
-  </td><td><tmpl_var requirement>
-  </td><td><tmpl_unless eventIsFull><a href="<tmpl_var purchase.url>"><tmpl_var purchase.label></a><tmpl_else><tmpl_var purchase.label><br /></tmpl_unless>
-  </td></tr>
-</tmpl_loop>
-<tmpl_if managePrereqs><tr><td><tmpl_var prereqForm.operator></td></tr></tmpl_if>
-</table>
-<tmpl_if managePrereqs><tmpl_var prereqForm.submit><tmpl_var prereqForm.footer></tmpl_if>
-
-<table width="100%">
-<tr><td align="right"><a href='<tmpl_var continue.url>'><tmpl_var continue.label></a></td></tr>
-</table>
-<tmpl_var paginateBar>
-
-
-~~~
-<style type="text/css">
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-.manageEvents {
-	margin-top:5px;
-	margin-bottom:5px;
-}
-.datacardtitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:13px;
-}
-
-.leftnav{
-	padding: 1px 1px 1px 1px;
-	background: white;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.leftnavon{
-	padding: 1px 1px 1px 1px;
-	background: yellow;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.calendartitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-}
-.filter-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 105px;
-}
-.compare-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 76px;
-}
-.filter-text {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 114px;
-}
-.smLink {
-   font-family: verdana;
-   font-size: 10px;
-   font-weight: normal;
-   color: blue;
-}
-
-#extendedSearchLayer {display: inline;}
-
-</style>
-
-<link href="^Extras(calendar/calendar-win2k-1.css);" rel="stylesheet" type="text/css" />
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view.tmpl
deleted file mode 100644
index 80184d78c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view.tmpl
+++ /dev/null
@@ -1,106 +0,0 @@
-#EventManagerTmpl000001
-#title:Default Event Management System
-#menuTitle:Default Event Management System
-#url:default-ems-template
-#namespace:EventManagementSystem
-#create
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-        <p><tmpl_var controls></p><br /><br />
-</tmpl_if>
-<ul>
-<tmpl_if canManageEvents>
-   <li><a href='<tmpl_var manageEvents.url>'><tmpl_var manageEvents.label></a></li>
-</tmpl_if>
-<li><a href='<tmpl_var managePurchases.url>'><tmpl_var managePurchases.label></a></li>
-<li><a href="<tmpl_var checkout.url>"><tmpl_var checkout.label></a></li>
-</ul>
-
-<table width="100%" border="1" cellpadding="8" cellspacing="0" style="border-top:solid gray 2px;border-bottom:solid gray 2px;">
-<tmpl_loop events_loop>
-<tr>
-	<td valign="top" colspan="7"><tmpl_var event></td>
-</tr>
-</tmpl_loop>
-</table>
-<tmpl_var paginateBar>
-	
-~~~
-<style type="text/css">
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-.manageEvents {
-	margin-top:5px;
-	margin-bottom:5px;
-}
-.datacardtitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:13px;
-}
-
-.leftnav{
-	padding: 1px 1px 1px 1px;
-	background: white;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.leftnavon{
-	padding: 1px 1px 1px 1px;
-	background: yellow;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.calendartitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-}
-.filter-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 105px;
-}
-.compare-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 76px;
-}
-.filter-text {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 114px;
-}
-.smLink {
-   font-family: verdana;
-   font-size: 10px;
-   font-weight: normal;
-   color: blue;
-}
-
-#extendedSearchLayer {display: inline;}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_event.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_event.tmpl
deleted file mode 100644
index 9befe1dc8..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_event.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-#EventManagerTmpl000002
-#title:Default Event Management System Event
-#menuTitle:Default Event Management System Event
-#url:default-ems-template-event
-#namespace:EventManagementSystem_product
-#create
-<h2 class="productTitle"><a href='<tmpl_var title.url>'><tmpl_var title></a></h2>
-
-<table class="productDetails" cellpadding="3" cellspacing="0">
-<tr>
-	<td class="description" valign="top"><tmpl_var description></td>
-	<td class="price" valign="top"><tmpl_var price></td>
-</tr>
-<tr class="softGray">
-	<td colspan="2"><strong>Max Attendees:</strong> <tmpl_var maximumAttendees></td>
-</tr>
-<tr class="softGray">	
-	<td colspan="2"><strong>Seats Remaining:</strong> <tmpl_var seatsRemaining></td>
-</tr>	
-<tr class="softGray">	
-	<td colspan="2"><strong>Number Registered:</strong> <tmpl_var numberRegistered></td>
-</tr>
-<tr class="softGray">	
-	<td colspan="2"><strong>Event Full?:</strong> <tmpl_var eventIsFull></td>
-</tr>
-<tr class="softGray">
-	<td  colspan="2" class="purchase">
-	<tmpl_unless eventIsFull>
-		<a style="cursor:pointer;" href="javascript:void(window.location=(confirm('<tmpl_var purchase.message>'))?'<tmpl_var purchase.wantToSearch.url>':'<tmpl_var purchase.wantToContinue.url>')"><tmpl_var purchase.label></a>
-	<tmpl_else>
-		<tmpl_var purchase.label><br />
-	</tmpl_unless>	
-	</td>
-</tr>
-</table>
-
-~~~
-<style type="text/css">
-	td.description {
-		width:80%;
-		text-align:left;
-		border-bottom:solid silver 1px;
-		font-style:italic;		
-	}
-	td.price {
-		width:20%;
-		text-align:right;
-		font-weight:bold;
-		border-bottom:solid silver 1px;
-	}
-	h2.productTitle {
-		margin-bottom:3px;
-		border-bottom:solid gray 1px;
-	}
-	table.productDetails {
-		padding-left:10px;
-		-moz-box-sizing:border-box;
-		width:100%;
-	}
-	tr.softGray td {
-		background-color:#F0F0F0;
-	}
-	td.purchase {
-		border:solid silver 1px;
-		text-align:center;
-	}
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_purchase.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_purchase.tmpl
deleted file mode 100644
index 2a744752e..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_purchase.tmpl
+++ /dev/null
@@ -1,82 +0,0 @@
-#EventManagerTmpl000005
-#title:Default Event Management System View Purchase
-#menuTitle:Default Event Management System View Purchase
-#url:default-ems-template-view-purchase
-#namespace:EventManagementSystem_viewPurchase
-#create
-<tmpl_if session.var.adminOn>
-        <p><tmpl_var controls></p><br /><br />
-</tmpl_if>
-<h2><tmpl_var viewPurchaseTitle></h2>
-
-<tmpl_if canReturn><tmpl_if canReturnTransaction>
-	<div style="text-align:right;">
-		(<a href="<tmpl_var appUrl>?func=returnItem;tid=<tmpl_var transactionId>">Return Entire Purchase</a>)
-	</div>
-</tmpl_if></tmpl_if>
-
-<tmpl_loop purchasesLoop>
-<table width="100%" border="0" class="viewPurchase">
-<tr>
-	<td class="badgeTitle">Badge Name</td>
-	<td class="itinerary">
-	Itinerary&nbsp;&nbsp;<tmpl_if canReturn><tmpl_if canReturnItinerary>(<a href="<tmpl_var appUrl>?func=returnItem;pid=<tmpl_var purchaseId>">Return Entire Itinerary</a>)</tmpl_if></tmpl_if>
-	</td>
-</tr>
-<tr>
-	<td class="badgeName" valign="top">
-		<tmpl_var firstName> <tmpl_var lastName><br /><br />
-		<tmpl_if canAddEvents><tmpl_if canReturnItinerary><a href="<tmpl_var appUrl>?func=addEventsToBadge;bid=<tmpl_var badgeId>">Add Events To Badge</a></tmpl_if></tmpl_if>
-	</td>
-	<td valign="top">
-		<table width="100%">
-		<tr>
-			<td><strong>Event Title</strong></td>
-			<td><strong>Event Dates</strong></td>
-		<tmpl_if canReturn>
-			<td><strong>Return Registration</strong></td>
-		</tmpl_if>
-		</tr>
-	<tmpl_loop regLoop>
-		<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>>
-			<td><tmpl_var title></td>
-			<td><tmpl_var startDateHuman> - <tmpl_var endDateHuman></td>
-		<tmpl_if canReturn>
-			<td><tmpl_if returned>RETURNED<tmpl_else><a href="<tmpl_var appUrl>?func=returnItem;rid=<tmpl_var registrationId>">Return This Registration</a></tmpl_if></td>
-		</tmpl_if>
-		</tr>
-	</tmpl_loop>
-		</table>
-	</td>
-</tr>
-</table>
-</tmpl_loop>
-~~~
-<style type="text/css">
-.viewPurchase {
-	border-bottom:solid silver 2px;
-}
-.viewPurchase td {
-	font-size:10pt;
-}
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-td.badgeTitle, td.itinerary   {
-	font-size:9pt;
-	font-weight:bold;	
-	border-bottom:solid gray 1px;
-}
-td.badgeName {
-	font-size:9pt;
-	font-style:italic;
-}
-h2 {
-	margin-bottom:3px;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_event.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_event.tmpl
deleted file mode 100644
index 9b04d0693..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_event.tmpl
+++ /dev/null
@@ -1,63 +0,0 @@
-#PBtmpl0000000000000023
-<h2><tmpl_var title></h2>
-
-<table width="100%" cellspacing="0" cellpadding="5" border="0">
-<tr>
-<td valign="top" class="tableHeader" width="100%">
-<b><tmpl_var start.label>:</b> <tmpl_var start.date><br />
-<b><tmpl_var end.label>:</b> <tmpl_var end.date><br />
-</td><td valign="top" class="tableMenu">
-
-<tmpl_if canEdit>
-     <a href="<tmpl_var edit.url>"><tmpl_var edit.label></a><br />
-     <a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-</tmpl_if>
-
-<tmpl_if previous.url>
-     <a href="<tmpl_var previous.url>"><tmpl_var previous.label></a><br />
-</tmpl_if>
-
-<tmpl_if next.url>
-     <a href="<tmpl_var next.url>"><tmpl_var next.label></a><br />
-</tmpl_if>
-
-</td></tr>
-<tr>
-	<td colspan="2" valign="top" align="left"><tmpl_var description></td>
-</tr>
-</table>
-
-
-<tmpl_loop others_loop>
-<tmpl_if __FIRST__>
-<p /><b>Events Near This One</b><br />
-</tmpl_if>
-<ul>
-<li><a href="<tmpl_var url>"><tmpl_var title></a></li>
-</ul>
-</tmpl_loop>
-
-
-~~~
-<style type="text/css">
-.fontSettings {
-	font-family:arial;
-	font-size:9pt;
-}
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.defaultEvent td {	
-	font-family:arial;
-	font-size:9pt;	
-}
-.tableMenu {
-	border:solid silver 1px;		
-}
-.tableMenu a {
-	color:#29587E;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_file_macro.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_file_macro.tmpl
deleted file mode 100644
index 752b441a0..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_file_macro.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#PBtmpl0000000000000039
-<a href="<tmpl_var file.url>"><img src="<tmpl_var file.icon>" style="border-style:none;vertical-align:middle;" /><tmpl_var file.name></a>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_forum.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_forum.tmpl
deleted file mode 100755
index 6268d68e4..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_forum.tmpl
+++ /dev/null
@@ -1,105 +0,0 @@
-#PBtmpl0000000000000026
-<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>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&#149;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&#149;
-	</tmpl_unless>
-	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-</p>
-
-<table width="100%">
-<tr>
-	<tmpl_if user.isModerator>
-		<td class="forumHead"><tmpl_var status.label></td>
-	</tmpl_if>
-	<td class="forumHead"><tmpl_var subject.label></td>
-	<td class="forumHead"><tmpl_var user.label></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.views.url>"><tmpl_var views.label></a></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.replies.url>"><tmpl_var replies.label></a></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.rating.url>"><tmpl_var rating.label></a></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.date.url>"><tmpl_var date.label></a></td>
-	<tmpl_if displayLastReply>
-		<td class="forumHead"><a href="<tmpl_var sortby.lastreply.url>"><tmpl_var lastReply.label></a></td>
-	</tmpl_if>
-</tr>
-<tmpl_loop post_loop>
-<tr>
-	<tmpl_if user.isModerator>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var status></td>
-	</tmpl_if>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a></td>
-	<tmpl_if user.isVisitor>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var username></td>
-	<tmpl_else>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var userProfile.url>"><tmpl_var username></a></td>
-	</tmpl_if>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" align="center"><tmpl_var views></td>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" align="center"><tmpl_var replies></td>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" align="center"><tmpl_var rating></td>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateSubmitted.human> @ <tmpl_var timeSubmitted.human></td>
-	<tmpl_if displayLastReply>
-		<td  class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" style="font-size: 11px;">
-			<a href="<tmpl_var lastReply.url>"><tmpl_var lastReply.title></a>
-			by
-			<tmpl_if lastReply.user.isVisitor>
-				<tmpl_var lastReply.username>
-			<tmpl_else>
-				<a href="<tmpl_var lastReply.userProfile.url>"><tmpl_var lastReply.username></a>
-			</tmpl_if>
-			on <tmpl_var lastReply.dateSubmitted.human> @ <tmpl_var lastReply.timeSubmitted.human>
-		</td>
-	</tmpl_if>
-</tr>
-</tmpl_loop>
-</table>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage>  &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-.forumHead {
-	background-color: #eeeeee;
-	border-bottom: 1px solid #cccccc;
-	padding: 2px;
-	padding-bottom: 4px;
-	font-size: 13px;
-	font-weight: bold;
-}
-.oddThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #83cc83;
-	padding-bottom: 4px;
-}
-.evenThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #aaaaff;
-	padding-bottom: 4px;
-}
-</style>
-
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_forum_search.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_forum_search.tmpl
deleted file mode 100644
index 467a0a874..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_forum_search.tmpl
+++ /dev/null
@@ -1,79 +0,0 @@
-#PBtmpl0000000000000031
-<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_var form.header>
-
-<h2><tmpl_var search.label></h2>
-<tmpl_var query.form><tmpl_var form.search>
-<tmpl_var form.footer>
-<tmpl_if doit>
-	<table width="100%" cellspacing="0" cellpadding="3" border="0" class="searchResults">
-	<tr>
-		<td class="tableHeader"><tmpl_var title.label></td>
-		<td class="tableHeader"><tmpl_var user.label></td>
-		<td class="tableHeader"><tmpl_var date.label></td>
-	</tr>
-	<tmpl_loop post_loop>
-		<tr>
-			<td <tmpl_if __ODD__>class="odd"</tmpl_if>><a href="<tmpl_var url>"><tmpl_var title></a></td>
-			<tmpl_if user.isVisitor>
-				<td <tmpl_if __ODD__>class="odd"</tmpl_if>><tmpl_var username></td>
-			<tmpl_else>
-				<td <tmpl_if __ODD__>class="odd"</tmpl_if>><a href="<tmpl_var userProfile.url>"><tmpl_var username></a></td>
-			</tmpl_if>
-			<td <tmpl_if __ODD__>class="odd"</tmpl_if>><tmpl_var dateSubmitted.human> @ <tmpl_var timeSubmitted.human></td>
-		</tr>
-	</tmpl_loop>
-	</table>
-</tmpl_if>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-
-
-~~~
-<style type="text/css">
-h2{
-	font-family:arial;
-}
-.searchResults{
-	border:solid silver 1px;
-	margin-top:5px;
-}
-.searchResults td{
-	font-family:arial;
-	font-size:9pt;
-}
-.searchResults td a{
-	color:#29587E;
-}
-.searchResults td.odd{
-	background-color:#DADADA;
-}
-.searchResults td.tableHeader{
-	background-color:gray;
-	color:white;
-	border-bottom:double solid silver 3px;
-	font-weight:bold;
-}
-.pagination
-{
-	background:#C0C0C0;
-	width:95%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-}
-
-.postControls a
-{
-	color:white;
-}
-
-</style>
\ No newline at end of file
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
deleted file mode 100644
index fc15940e6..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_gradebook_report.tmpl
+++ /dev/null
@@ -1,46 +0,0 @@
-#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
deleted file mode 100644
index aa0565d4a..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_grouped_aggregate_feeds.tmpl
+++ /dev/null
@@ -1,56 +0,0 @@
-#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_http_proxy.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_http_proxy.tmpl
deleted file mode 100644
index d6c297066..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_http_proxy.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-#PBtmpl0000000000000033
-<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 search.for>
-	<tmpl_if content>
-		<!-- Display search string. Remove if unwanted -->
-		<tmpl_var search.for>
-	<tmpl_else>
-		<!-- Error: Starting point not found -->
-		<b>Error: Search string <i><tmpl_var search.for></i> not found in content.</b>
-	</tmpl_if>
-</tmpl_if>
-
-<tmpl_var content>
-
-<tmpl_if stop.at>
-	<tmpl_if content.trailing>
-		<!-- Display stop search string. Remove if unwanted -->
-		<tmpl_var stop.at>
-	<tmpl_else>
-		<!-- Warning: End point not found -->
-		<b>Warning: Ending search point <i><tmpl_var stop.at></i> not found in content.</b>
-	</tmpl_if>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ldap_account_display_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ldap_account_display_template.tmpl
deleted file mode 100644
index 552a4e04b..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ldap_account_display_template.tmpl
+++ /dev/null
@@ -1,27 +0,0 @@
-#PBtmpl0000000000000004
-<h2>
-	<tmpl_var title>
-</h2>
-
-<tmpl_var account.message>
-<tmpl_if account.form.karma>
-<br /><br />
-<table>
-<tr>
-	<td class="formDescription">
-		<tmpl_var account.form.karma.label>
-	</td>
-	<td class="tableData">
-	 	<tmpl_var account.form.karma>
-	</td>
-</tr>
-</table>
-</tmpl_if>
-
-<div class="accountOptions">
-	<ul>
-		<tmpl_loop account.options>
-			<li><tmpl_var options.display></li>
-		</tmpl_loop>
-	</ul>
-</div>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ldap_anonymous_registration_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ldap_anonymous_registration_template.tmpl
deleted file mode 100644
index 3012f4d9c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ldap_anonymous_registration_template.tmpl
+++ /dev/null
@@ -1,43 +0,0 @@
-#PBtmpl0000000000000005
-<h2>
-   <tmpl_var title>
-</h2>
-<tmpl_if create.message>
-   <tmpl_var create.message>
-</tmpl_if>
-
-<tmpl_var create.form.header>
-<table>
-<tmpl_var create.form.hidden>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var create.form.ldapConnection.label></td>
-   <td class="tableData"><tmpl_var create.form.ldapConnection></td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var create.form.ldapId.label></td>
-   <td class="tableData"><tmpl_var create.form.ldapId></td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var create.form.password.label></td>
-   <td class="tableData"><tmpl_var create.form.password></td>
-</tr>
-<tmpl_loop create.form.profile>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var profile.formElement.label></td>
-   <td class="tableData"><tmpl_var profile.formElement></td>
-</tr>
-</tmpl_loop>
-<tr>
-   <td class="formDescription" valign="top"></td>
-   <td class="tableData"><tmpl_var create.form.submit></td>
-</tr>
-</table>
-<tmpl_var create.form.footer>
-
-
-<div class="accountOptions">
-   <ul>
-     <li><a href="<tmpl_var login.url>"><tmpl_var login.label></a></li>
- 
-  </ul>
-</div>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ldap_login_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ldap_login_template.tmpl
deleted file mode 100644
index 3f5195dc2..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ldap_login_template.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-#PBtmpl0000000000000006
-<h2>
-   <tmpl_var title>
-</h2>
-<tmpl_if login.message>
-   <tmpl_var login.message>
-</tmpl_if>
-
-<tmpl_var login.form.header>
-<table >
-<tmpl_var login.form.hidden>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var login.form.username.label></td>
-   <td class="tableData"><tmpl_var login.form.username></td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var login.form.password.label></td>
-   <td class="tableData"><tmpl_var login.form.password></td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top"></td>
-   <td class="tableData"><tmpl_var login.form.submit></td>
-</tr>
-</table>
-<tmpl_var login.form.footer>
-
-<div class="accountOptions">
-   <ul>
-             <tmpl_if anonymousRegistration.isAllowed>
-	     <li><a href="<tmpl_var createAccount.url>"><tmpl_var createAccount.label></a></li>
-	  </tmpl_if>
-
-   </ul>
-</div>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_login_box.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_login_box.tmpl
deleted file mode 100644
index 5cc85c6ca..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_login_box.tmpl
+++ /dev/null
@@ -1,22 +0,0 @@
-#PBtmpl0000000000000044
-<div class="loginBox">
-<tmpl_if user.isVisitor>
-	<tmpl_var form.header>
-             <tmpl_var username.label><br />
-             <tmpl_var username.form><br />
-             <tmpl_var password.label><br />
-             <tmpl_var password.form><br />
-             <tmpl_var form.login>
-	<tmpl_var form.footer>
-	<tmpl_if session.setting.anonymousRegistration>
-                        <p><a href="<tmpl_var account.create.url>"><tmpl_var account.create.label></a></p>
-	</tmpl_if>	
-<tmpl_else>
-	<tmpl_unless customText>
-		<tmpl_var hello.label> <a href="<tmpl_var account.display.url>"><tmpl_var session.user.username></a>.
-                          <a href="<tmpl_var logout.url>"><tmpl_var logout.label></a>
-	<tmpl_else>
-		<tmpl_var customText>
-	</tmpl_unless>
-</tmpl_if>
-</div>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_message_board.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_message_board.tmpl
deleted file mode 100644
index 075cfc522..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_message_board.tmpl
+++ /dev/null
@@ -1,99 +0,0 @@
-#PBtmpl0000000000000047
-<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 session.var.adminOn>
-	<a href="<tmpl_var forum.add.url>"><tmpl_var forum.add.label></a>
-	<p />
-</tmpl_if>
-
-<tmpl_if areMultipleForums>
-	<table width="100%" cellpadding="3" cellspacing="0" class="defaultMessageBoard">
-		<tr>
-			<tmpl_if session.var.adminOn>
-				<td></td>
-			</tmpl_if>
-			<td class="tableHeader"><tmpl_var title.label></td>
-			<td class="tableHeader"><tmpl_var views.label></td>
-			<td class="tableHeader"><tmpl_var rating.label></td>
-			<td class="tableHeader"><tmpl_var threads.label></td>
-			<td class="tableHeader"><tmpl_var replies.label></td>
-			<td class="tableHeader"><tmpl_var lastpost.label></td>
-		</tr>
-		<tmpl_loop forum_loop>			
-			<tr>
-				<tmpl_if session.var.adminOn>
-					<td><tmpl_var forum.controls></td>
-				</tmpl_if>
-				<td<tmpl_if __ODD__> class="even"</tmpl_if>>
-					<a href="<tmpl_var forum.url>"><tmpl_var forum.title></a><br />
-					<span style="font-size: 10px;"><tmpl_var forum.description></span>
-				</td>
-				<td<tmpl_if __ODD__> class="even"</tmpl_if> align="center"><tmpl_var forum.views></td>
-				<td<tmpl_if __ODD__> class="even"</tmpl_if> align="center"><tmpl_var forum.rating></td>
-				<td<tmpl_if __ODD__> class="even"</tmpl_if> align="center"><tmpl_var forum.threads></td>
-				<td<tmpl_if __ODD__> class="even"</tmpl_if> align="center"><tmpl_var forum.replies></td>
-				<td<tmpl_if __ODD__> class="even"</tmpl_if>><span style="font-size: 10px;">
-					<a href="<tmpl_var forum.lastpost.url>"><tmpl_var forum.lastpost.subject></a>
-					by
-					<tmpl_if forum.lastpost.user.isVisitor>
-						<tmpl_var forum.lastpost.user.name>
-					<tmpl_else>
-						<a href="<tmpl_var forum.lastpost.user.profile>"><tmpl_var forum.lastpost.user.name></a>
-					</tmpl_if>
-					on <tmpl_var forum.lastpost.date> @ <tmpl_var forum.lastpost.time>
-				</span></td>
-			</tr>
-		</tmpl_loop>
-	</table>
-<tmpl_else>
-	<h2><tmpl_var default.title></h2>
-	<tmpl_if session.var.adminOn>
-		<tmpl_var default.controls><br />
-	</tmpl_if>
-	<tmpl_var default.description>
-	<p />
-	<tmpl_var default.listing>
-</tmpl_if>
-
-
-~~~
-<style type="text/css">
-.defaultMessageBoard {
-
-}
-.defaultMessageBoard .tableHeader{
-	font-weight:bold;
-	border-bottom:solid gray 3px;
-	text-align:center;
-}
-.defaultMessageBoard td {
-	font-family:arial;
-	font-size:9pt;
-	border-bottom:solid gray 1px;
-}
-.defaultMessageBoard td a {
-	color:#29587E;
-}
-.defaultMessageBoard td.even {
-	background-color:#DADADA;
-	border-bottom:solid gray 1px;
-}
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-</style>
\ No newline at end of file
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
deleted file mode 100644
index db9c890fb..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_overview_report.tmpl
+++ /dev/null
@@ -1,93 +0,0 @@
-#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_page.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_page.tmpl
deleted file mode 100755
index 88791cdba..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_page.tmpl
+++ /dev/null
@@ -1,41 +0,0 @@
-#PBtmpl0000000000000054
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position1" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position1_loop>
-	<tmpl_if showAdmin>
-		<tr id="td<tmpl_var id>"><td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-		</div></td></tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-	</tbody></table>
-</tmpl_if>
-</div>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-	<tmpl_var dragger.init>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_payment_gateway_selection_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_payment_gateway_selection_template.tmpl
deleted file mode 100644
index 815e01ad3..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_payment_gateway_selection_template.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-#PBtmpl0000000000000017
-<tmpl_if pluginsAvailable>
-   <tmpl_var message><br />
-    <tmpl_var formHeader>
-       <table border="0" cellspacing="0" cellpadding="5">
-    <tmpl_loop pluginLoop>
-            <tr>
-                        <td><tmpl_var formElement></td>
-                     <td align="left"><tmpl_var name></td>
-           </tr>
-       </tmpl_loop>
-        </table>
-    <tmpl_var formSubmit>
-    <tmpl_var formFooter>
-<tmpl_else>
- <tmpl_var noPluginsMessage>
-</tmpl_if>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_pm_edit_task.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_pm_edit_task.tmpl
deleted file mode 100644
index 676a75b0d..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_pm_edit_task.tmpl
+++ /dev/null
@@ -1,75 +0,0 @@
-#ProjectManagerTMPL0004
-#title:Default Project Manager Edit Task
-#menuTitle:Default Project Manager Edit Task
-#url:default-pm-template-edit-task
-#namespace:ProjectManager_editTask
-#create
-
-<tmpl_var form.header>
-<table class="popUp" cellspacing="0" cellpadding="3" border="0">
-<tbody>
-<tr>
-	<td align="right" style="width:25%;" class="header">Task Name&nbsp;</td>
-	<td style="width:75%;"><tmpl_var form.name></td>
-</tr>	
-<tr>
-	<td colspan="2">
-		<table width="100%" cellpadding="3" cellspacing="0">
-		<tbody>
-		<tr class="clear">
-			<td style="width:25%;" align="right" class="header">Start&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.start></td>
-			<td style="width:25%;" align="right" class="header">Finish&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.end></td>
-		</tr>
-		</tbody>
-		</table>
-	</td>
-</tr>
-<tr>
-	<td colspan="2">
-		<table width="100%" cellpadding="3" cellspacing="0">
-		<tbody>
-		<tr class="clear">
-			<td style="width:25%;" align="right" class="header">Duration&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.duration>&nbsp;<tmpl_var form.duration.units></td>
-			<td style="width:25%;" align="right" class="header">Is Milestone&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.milestone></td>
-		</tr>
-		</tbody>
-		</table>
-	</td>
-</tr>	
-<tr>
-	<td colspan="2">
-		<table width="100%" cellpadding="3" cellspacing="0">
-		<tbody>
-		<tr class="clear">
-			<td style="width:25%;" align="right" class="header">Predecessor&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.dependants></td>
-			<td style="width:25%;" align="right" class="header">% Complete&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.percentComplete></td>
-		</tr>
-		</tbody>
-		</table>
-	</td>
-</tr>	
-<tr>
-	<td colspan="2">
-		<table width="100%" cellpadding="3" cellspacing="0">
-		<tbody>
-		<tr class="clearNoBG">
-			<td style="width:25%;" align="right" class="header">Resource&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.resource></td>
-			<td style="width:25%;">&nbsp;</td>
-			<td style="width:25%;" align="right" class="header"><a href="javascript:void(checkEditTaskForm(document.editTaskForm))" class="saveBtn">Save</a></td>
-		</tr>
-		</tbody>
-		</table>
-	</td>		
-</tr>	
-</tbody>
-</table>
-<tmpl_var form.footer>
-
-~~~
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_pm_gantt_chart.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_pm_gantt_chart.tmpl
deleted file mode 100644
index 2044ce511..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_pm_gantt_chart.tmpl
+++ /dev/null
@@ -1,52 +0,0 @@
-#ProjectManagerTMPL0003
-#title:Default Project Manager Gantt Chart
-#menuTitle:Default Project Manager Gantt Chart
-#url:default-pm-template-gantt-chart
-#namespace:ProjectManager_gantt
-#create
-<script>
-   var taskArray=<tmpl_var project.task.array>;
-</script>
-<div class="barPositions">
-   <tmpl_loop task.div.loop>
-      <tmpl_if task.isMilestone>      
-	     <div class="milestone" style="left:<tmpl_var task.div.left>px;top:<tmpl_var task.div.top>px;">&diams;</div>
-	  <tmpl_else>
-	     <div class="projectBar" style="left:<tmpl_var task.div.left>px;top:<tmpl_var task.div.top>px;width:<tmpl_var task.div.width>px;">	 
-		    <div class="statusBar" style="width:<tmpl_var task.div.percentComplete>%;"></div>
-            <tmpl_if task.hasPredecessor>   
-		       <div class="projectLineH" style="top:4px;left:50px;width:75px;height:28px;">
-	              <div class="projectLineV"></div>
-		       </div>
-	        </tmpl_if>
-	        <tmpl_if task.hasResource>
-		       <div class="projectLabel" style="left:<tmpl_var task.div.label.left>px;top:3px;margin-top:-3px;">
-		          <tmpl_var task.resource.name>			
-		       </div>
-	        </tmpl_if> 
-		 </div>
-	  </tmpl_if>	  
-   </tmpl_loop>
-   <a name="<tmpl_var project.table.width>" id="projectTableWidth"></a>
-   <a name="<tmpl_var project.scroll.percentWidth>" id="projectScrollPercentWidth"></a>
-   <table cellpadding="0" cellspacing="0" border="0" style="width:<tmpl_var scrollWidth>px;z-index:1;">
-      <tr class="monthNames">
-	     <tmpl_loop months.loop>
-		    <td colspan="<tmpl_var month.colspan>" class="monthName" style="height:20px;"><tmpl_var month.name></td>
-		 </tmpl_loop>
-	  </tr>	
-	  <tr class="dates">
-	     <tmpl_loop days.loop>
-		    <td  align="center" style="width:23px"><tmpl_var day.number></td>
-		 </tmpl_loop>
-	  </tr>
-	  <tmpl_loop task.count.loop>
-	     <tr>
-		    <td colspan="<tmpl_var total.colspan>" class="empty" style="height:21px;">&nbsp;</td>
-	     </tr>
-	  </tmpl_loop>
-   </table>
-   <br />
-</div>
-
-~~~
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_pm_project_display.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_pm_project_display.tmpl
deleted file mode 100644
index 61015c58c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_pm_project_display.tmpl
+++ /dev/null
@@ -1,645 +0,0 @@
-#ProjectManagerTMPL0002
-#title:Default Project Display
-#menuTitle:Default Project Display
-#url:default-pm-template-project-display
-#namespace:ProjectManager_project
-#create
-<script type="text/javascript" src="<tmpl_var extras.base>/js/at/AjaxRequest.js"></script>
-<script type="text/javascript" src="<tmpl_var extras.base>/js/modal/modal.js"></script>
-
-<script src="<tmpl_var extras.base>/calendar/calendar.js" type="text/javascript"></script>
-<script src="<tmpl_var extras.base>/contextMenu/contextMenu.js" type="text/javascript"></script>
-<script src="<tmpl_var extras.base>/calendar/lang/calendar-en.js" type="text/javascript"></script>
-<script src="<tmpl_var extras.base>/calendar/calendar-setup.js" type="text/javascript"></script>
-
-<script type="text/javascript">
-    var dayMS = 86400000;
-	
-	var popTitle = "Add/Edit Task";
-	
-	var dunits = "<tmpl_var project.durationUnits>";
-	var hoursPerDay = <tmpl_var project.hoursPerDay>;
-	var taskLength=<tmpl_var project.task.length>;
-	
-   //--------------------------------------------------------------------------------------	
-	function doCalendar (fieldId) {
-	   Calendar.setup({ 
-                         inputField : fieldId, 
-                         ifFormat : "%Y-%m-%d", 
-                         showsTime : false, 
-                         step : 1,
-                         timeFormat : "12",
-                         firstDay : false
-                    }); 
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function closeImage() {
-       return '<tmpl_var extras>/close.gif';
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function configureMilestone(box) {
-	   var form = box.form;
-	   if(box.checked==true) { 
-	      form.end.value=form.start.value; 
-		  form.duration.value=0; 
-		  form.duration.disabled=true; 
-		  form.end.disabled=true;
-		  form.dependants.disabled=true;
-		  form.resource.disabled=true;
-		  form.percentComplete.disabled=true;
-		  form.percentComplete.value=0;
-	   } else { 
-	      form.end.disabled=false; 
-		  form.duration.disabled=false; 
-		  form.dependants.disabled=false;
-		  form.resource.disabled=false;
-		  form.percentComplete.disabled=false;
-		  form.duration.value = (dunits == "hrs")?hoursPerDay:1;
-	   }
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function checkEditTaskForm (form) {
-	   if(form.name.value == "") {
-	      alert("<tmpl_var form.name.error>");
-		  return;
-	   } else if(form.start.value == "") {
-	      alert("<tmpl_var form.start.error>");
-		  return;
-	   } else if(form.milestone.checked==false && form.end.value == "") {
-	      alert("<tmpl_var form.end.error>");
-		  return;
-	   }
-	   form.submit();
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function intlDate(dateObj) {
-	   return dateObj.getFullYear()+"-"+pad((dateObj.getMonth()+1))+"-"+pad(dateObj.getDate());
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function toDateObj(date) {
-	   var to = date.split("-");
-	   var dateObj = new Date(to[0],(to[1]-1),to[2],0,0,1,0);
-	   return dateObj;
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function adjustTaskTimeFromDuration(start, end, duration, isTaskForm, predecessor, origStart, origEnd, seqNum) {
-	   //set the form element
-	   var form = duration.form;
-	   
-	   //get today's date
-	   var today = new Date();
-	   var todayIntl = intlDate(today);
-	   //set start and end date if not already set
-	   if(start.value == "") start.value = todayIntl;
-	   if(end.value == "") end.value = todayIntl;
-	   	   
-	   //Convert predecessor hours to days
-	   var taskDuration = duration.value;
-	   if(dunits == "hrs") taskDuration = taskDuration / hoursPerDay;
-	   var durationFloor = Math.floor(taskDuration);
-	   
-	   //Handle task form and main form seperately due to differences in the forms
-	   if(isTaskForm && taskDuration <= 0) {
-	      //Convert to milestone if task is less or equal to zero
-	      if(confirm("Zero duration tasks are considered Milestones.  Do you wish to change this task to a milestone?")) {
-		     form.milestone.checked = true;
-			 configureMilestone(form.milestone);
-		  } else {
-			 duration.value = form.orig_duration.value;
-	      }
-		  return;
-	   } else if (taskDuration <= 0){
-	      //Do not let users zero out tasks
-		  alert("Zero duration tasks are considered Milestones.  Please edit the task by clicking the link if you wish to change this task to a milestone");
-		  return;
-	   }
-	   
-	   //create the start date 
-	   var aTo = start.value.split("-");
-	   var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-       
-	   //add new duration days to the start date
-       toDate.setDate(toDate.getDate() + durationFloor);
-			  
-	   //set end date to this date
-	   end.value = intlDate(toDate);
-	   
-	   //Set new duration in taskArray
-	   taskArray[seqNum]["duration"] = duration.value;
-	   //Adjust time based on new end date
-	   adjustTaskTimeFromDate(start, end, duration, end, isTaskForm, predecessor, origStart, origEnd, seqNum);
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function adjustTaskTimeFromDate (start, end, duration, element, isTaskForm, predecessor, origStart, origEnd, seqNum) {
-	   //set the form element
-	   var form = element.form;
-	   //set original duration from task form to determine whether or not to continue to set duration
-	   var orig_duration;
-	   
-	   if(isTaskForm) {
-	      if(form.milestone.checked == true) return;
-          orig_duration = form.orig_duration.value;
-	   }
-	   
-	   if (end.value == "") end.value = start.value;
-	   else if(start.value == "") start.value = end.value;
-	   
-	   if(isTaskForm && orig_duration == "") {
-	      //Set duration if this is a new record
-		  //Check to make sure start date comes before end date
-		  var startcomp = start.value.replace(/-/g,"");
-	      var endcomp = end.value.replace(/-/g,"");
-	      if(startcomp > endcomp) {
-	         alert("<tmpl_var form.greaterthan.error>");
-		     if(element.name == "start") {
-		        end.value = element.value;
-		     } else {
-		        start.value = element.value;
-		     }
-		     duration.value = (dunits == "hrs")?hoursPerDay:1;
-		     return;
-	      }
-	   
-	      var d = getDaysInterval(start.value,end.value);
-		  if(d == 0) d = 1;
-	      if(dunits == "hrs") {
-	         d = d * hoursPerDay;
-	      }
-	      duration.value = d;
-	   } else {
-	      //Set start/end if duration has been saved
-		  var d = duration.value; 
-		  if(dunits == "hrs") {
-		     //Convert to days
-		     d = d / hoursPerDay;
-		  }
-	      //Round off duration or set it to zero if less than 1;
-		  //alert("d = " + d + " floor = " + Math.floor(d));
-		  if(d < 1) d = 0;
-		  else d = Math.floor(d);
-		  
-		  if(element.name.indexOf("start") > -1) {
-		     //create the date 
-			  var aTo = start.value.split("-");
-			  var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-             //add duration days to the start date
-              toDate.setDate(toDate.getDate() + d);
-			  //set end date to this date
-			  end.value = intlDate(toDate);
-		  } else if(element.name.indexOf("end") > -1) {
-		      //create the date
-			  var aFrom = end.value.split("-");
-			  var fromDate = new Date(aFrom[0],(aFrom[1]-1),aFrom[2],0,0,1,0);
-			  //subtract duration days from the end date
-			  fromDate.setDate(fromDate.getDate() - d);
-			  //set start date to this date
-			  start.value = intlDate(fromDate);
-		  }
-	   }
-	   
-	   //Check Predecessors before moving stuff
-	   var pred = predecessor.value;
-	   if(pred != "") {
-		  //Check to make sure that the dependency requirement for this task is still valid
-		  //Get the predecessor end date
-	      var taskStart = toDateObj(start.value);
-		  var predTaskEnd;
-		  if(isTaskForm) {
-		     predTaskEnd = toDateObj(taskArray[pred]["end"]);
-		  } else {
-		     var predTaskEndId = "end_"+taskArray[pred]["id"]+"_formId"
-		     predTaskEnd = toDateObj(document.getElementById(predTaskEndId).value);
-		  }
-		  
-		  if(taskStart.getTime() < predTaskEnd.getTime()) {
-		     alert("<tmpl_var form.invalidMove.error>");
-			 start.value = origStart.value;
-			 end.value = origEnd.value;
-			 return;
-		  }
-	   }
-	   
-	   //Check all tasks past this one and move them forward if necessary (this only needs to happen on the main form)
-	   if(!isTaskForm) {
-	      arrangePredecessors(element,seqNum);
-	   }
-	   //reset orig start and end values
-	   origStart.value = start.value;
-	   origEnd.value = end.value;
-	   
-	   if(!isTaskForm) {
-	      //Adjust task form for 
-	      paintGanttChart();
-	   }
-	}
-   
-   //--------------------------------------------------------------------------------------
-   function trim(str) {
-      return str.replace(/^\s+|\s+$/, '');
-   }
-	
-   //--------------------------------------------------------------------------------------
-   function arrangePredecessors (element,seqNum) {
-  	  
-	  for (var i = 1; i <= taskLength; i++) {
-	     var seq = i;
-		 var task = taskArray[seq];
-		 var taskId = task["id"];
-		 //Calculate duration and duraiton floor
-		 var durationInDays = parseFloat(task["duration"]);
-		 if(dunits == "hrs") durationInDays = durationInDays / hoursPerDay;
-		 var durationFloor = Math.floor(durationInDays);
-		 //alert("Duration Floor is: "+durationFloor);
-		 //Get the current elements
-		 var currElementStart = document.getElementById("start_"+taskId+"_formId");
-	     var currElementEnd = document.getElementById("end_"+taskId+"_formId");
-		 //alert("Current Start Date: "+currElementStart.value+"   Current End Date: "+currElementEnd.value);
-		 //Skip the first record as it is the record that was changed
-		 if(seq > 1) {
-		    var predecessor = task["predecessor"];
-			//alert("predecessor for "+i+" is "+predecessor);
-			if(predecessor != "") {
-			   var pred = taskArray[predecessor];
-			   var predEndDate = toDateObj(pred["end"]);
-			   var startDate = toDateObj(task["start"]);
-			   //alert ("Pred End Date: "+intlDate(predEndDate));
-			   //Make sure start date of this task is greater than the end date of the predecessor
-			   if(startDate.getTime() <= predEndDate.getTime()) {
-			      //Change the start and end dates of the task
-				  //Get the day part of the predecessor
-				  var predDayPart = parseFloat(pred["dayPart"]);
-				  //alert("predDayPart: "+predDayPart);
-				  if(predDayPart > 0) {
-				     //The previous task took up part of a day.  Add the additional day part to the duration
-					 durationInDays += predDayPart;
-					 durationFloor = Math.floor(durationInDays);
-				  }
-				  //alert("Duration in Days: "+durationInDays+" Duration Floor: "+durationFloor);
-				  //Set the start date of this task to the end date of the predecessor
-				  currElementStart.value = pred["end"];
-				  //Adjust end date for change in start date and update the object - start date is actually predEndDate now, so use the existing date object
-				  predEndDate.setDate(predEndDate.getDate() + durationFloor);
-				  currElementEnd.value = intlDate(predEndDate);
-				 //alert("Set seq "+i+" to start: "+pred["end"]+" end: "+intlDate(predEndDate));
-			   }
-			}
-		 }
-		  
-		 //Update task array with new start/end values
-		 taskArray[seq]["start"] = currElementStart.value;
-		 taskArray[seq]["end"] = currElementEnd.value;
-		 taskArray[seq]["dayPart"] = (durationInDays - Math.floor(durationInDays));
-	  }
-   }
-	
-   //--------------------------------------------------------------------------------------	
-	function getDaysInterval(from,to) {
-       var aFrom = from.split("-");
-	   var aTo = to.split("-");
-	   var fromDate = new Date(aFrom[0],(aFrom[1]-1),aFrom[2],0,0,1,0);
-	   var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-	   var fromEpoch = fromDate.getTime();
-	   var toEpoch = toDate.getTime();
-	  
-	   var seconds = toEpoch - fromEpoch;
-	   if(seconds == 0) return 0;
-	   return (seconds/dayMS);
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function pad(date) {
-       var str = ""+date;
-       if(str.length == 1) {
-	      str = "0"+str;
-	   }
-	   return str;
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function paintGanttChart () {
-	   var status = AjaxRequest.submit(document.forms['editAll'],{
-                                      'onSuccess':function(req){ document.getElementById('gantt').innerHTML = req.responseText; }
-                                     });
-       
-	   var mwidth = document.getElementById("projectTableWidth").name + "px";
-	   var swidth = document.getElementById("projectScrollPercentWidth").name + "%";
-	   document.getElementById("mastertable").style.width=mwidth;
-	   document.getElementById("scrolltd").style.width=swidth;
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function validateDependant(field,origField,seqNum,start,end,duration,isTaskForm,origStart,origEnd) {
-	   var pred = field.value;
-	   var newTask = false;
-	   if(pred != "") {
-	      if(seqNum == "") seqNum = taskLenth+1;
-		  if(pred < 1) {
-	         alert("<tmpl_var form.noPredecessor.error>");
-		     field.value=origField.value;
-		     return;
-	      }
-	      if(pred == seqNum) {
-	         alert("<tmpl_var form.samePredecessor.error>");
-		     field.value=origField.value;
-		     return;
-	      }
-	      if(pred > seqNum) {
-	         alert("<tmpl_var form.previousPredecessor.error>");
-		     field.value = origField.value;
-		     return; 
-	      }
-		  
-	      //Set defaults if it's a new record and one of the other options hasn't been checked.
-	      if(start.value == "" || end.value == "") {
-             //get today's date
-			 newTask = true;
-			 duration.value = (dunits == "hrs")?hoursPerDay:1; 
-		  }
-	      //Get the predecessor end date and decide where the new start date belongs
-	      var taskStart = start.value;
-		  var taskStartObj = toDateObj(taskStart);
-		  var predTaskEnd = taskArray[pred]["end"];
-		  var predTaskEndObj = toDateObj(predTaskEnd);
-		  
-		  //Change start date if it comes before predecessor end date
-		  if(newTask || (taskStartObj.getTime() < predTaskEndObj.getTime())) {
-		     
-			 //Convert predecessor hours to days
-	         var taskDuration = duration.value;
-			 if(dunits == "hrs") taskDuration = taskDuration / hoursPerDay;
-			 var durationFloor = Math.floor(taskDuration);
-			 
-			 //Get the predecessor dayPart
-			 var predDayPart = parseFloat(pred["dayPart"]);
-		     if(predDayPart > 0) {
-		        //The previous task took up part of a day.  Add the additional day part to the duration
-			    taskDuration += predDayPart;
-				durationFloor = Math.floor(durationInDays);
-			 }
-	         
-			 //Set the start date of this task to the end date of the predecessor
-		     start.value = predTaskEnd;
-			 //Adjust end date for change in start date
-	         adjustTaskTimeFromDate(start,end,duration,start,isTaskForm,field,origStart,origEnd,seqNum);
-			 return;
-		  }
-	   }
-	   
-	   //Set new predecessor in taskArray
-	   taskArray[seqNum]["predecessor"] = pred;
-	   
-	   //Repaint
-	   if(!isTaskForm) {
-	      paintGanttChart();
-	   }
-	}
-   
-    addEvent(window, "load", initPopUp);
-</script>
-<tmpl_var form.header>
-<table cellpadding="0" cellspacing="0" border="0" class="project" id="mastertable" style="width:<tmpl_var project.table.width>px;">
-<tr>
-	<td style="width:20px;height:20px;">&nbsp;</td>
-	<td style="width:300px;" align="center">Task Name</td>
-	<td style="width:70px;" align="center">Duration</td>
-	<td style="width:70px;" align="center">Start</td>
-	<td style="width:70px;" align="center">Finish</td>
-	<td style="width:30px;" align="center">Pred</td>
-	<td rowspan="<tmpl_var project.gaant.rowspan>" valign="top" id="scrolltd" style="border-style:none;width:<tmpl_var project.scroll.percentWidth>%;">
-		<div class="scroller" id="gantt">
-			<tmpl_var project.ganttChart>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td colspan="6">&nbsp;</td>
-</tr>
-<tmpl_loop task.loop>
-   <tr>
-	   <td align="center" style="height:20px"><tmpl_var task.number></td>
-	   <td align="left" style="height:20px">
-	      <tmpl_if task.canAdd>
-		     <a href="<tmpl_var task.edit.url>" class="submodal"><tmpl_var task.name></a>
-		  <tmpl_else>
-		     <tmpl_var task.name>
-		  </tmpl_if>
-	   </td>
-	   <td align="center" style="height:20px"><tmpl_var task.duration> <tmpl_var task.duration.units></td>
-	   <td align="center" style="height:20px"><tmpl_var task.start></td>
-	   <td align="center" style="height:20px"><tmpl_var task.end></td>
-	   <td align="center" style="height:20px"><tmpl_var task.dependants></td>	
-   </tr>
-</tmpl_loop>
-<tr>
-	<td colspan="6" style="border-style:none;">&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="6" style="border-style:none;">&nbsp;</td>
-</tr>
-</table>
-<tmpl_var form.footer>
-
-<div id="links">
-<!-- 	<tmpl_if project.canEdit><a href="<tmpl_var task.resources.url>"><tmpl_var task.resources.label></a>&nbsp;|&nbsp;</tmpl_if> -->
-	<tmpl_if task.canAdd><a href="<tmpl_var task.add.url>" class="submodal"><tmpl_var task.add.label></a>&nbsp;|&nbsp;</tmpl_if>
-	<a href="<tmpl_var task.back.url>"><tmpl_var task.back.label></a>
-</div>
-
-~~~
-<style type="text/css">
-	body, html {
-		margin:0px;
-		padding:0px;
-	}
-	.project {
-		position:relative;
-		margin-top:5px;
-		margin-left:5px;
-	}
-	.project td {
-		border:solid silver 1px;
-		border-bottom:solid gray 1px;
-		font-size:9pt;
-		font-family:arial;		
-	}
-	.project a {
-	    color:#000000;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.project a:hover {
-	    color:#7AB7E9;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.taskname {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 295px;
-    }
-	.taskduration {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 25px;
-	}
-	.taskdate {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 68px;
-	}
-	.taskdependant {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 20px;
-	}
-	tr.monthNames td {		
-		text-align:center;		
-	}
-	tr.dates td {
-		width:16px;
-	}
-	div.scroller {		
-		overflow:scroll;		
-		position:relative;
-		width:400px;		
-	}
-	
-	* html div.scroller {
-		overflow-x:scroll;
-	}
-	
-	td.empty {
-		background-color:transparent;
-		border-style:none;
-		height:20px;
-	}
-	
-	div.barPositions {
-		position:relative;
-	}
-	div.projectBar {
-		background-color:#7AB7E9;
-		position:absolute;
-		height:10px;
-		z-index:2;
-		padding:0px;
-		margin:0px;
-		font-size:1pt;
-	}
-	div.statusBar {	
-		background-color:#000;
-		position:absolute;	
-		height:5px;
-		z-index:3;
-		padding:0px;
-		top:2px;
-		margin:0px;		
-		font-size:1pt;		
-	}
-	
-	div.projectLineH {		
-		background: url('images/dot.gif') top repeat-x;		
-		font-size:1pt;
-		text-align:right;
-		position:absolute;
-	}		
-	div.projectLineV {
-		width:1px;
-		background-color:black;
-		position:relative;
-		font-size:1pt;	
-		height:100%;
-		float:right;
-	}
-	
-	div.projectLabel {
-		position:absolute;
-		margin-top:-3px;
-		white-space:nowrap;
-		font-family: verdana;
-		font-size:8px;
-	}
-	
-	div.milestone {
-		color:#000000;
-		position:absolute;
-		z-index:4;
-		margin:0px;
-		padding:0px;		
-		margin-top:-3px;
-		font-size: 10px;
-		font-family: times;
-	}
-	
-	#links {
-		margin-top:7px;
-		margin-left:5px;
-		font-family:arial;
-		font-size:9pt;
-	}
-	
-	#links a {
-		color:#7AB7E9;
-	}
-</style>
-
-<style>
-.popUp {
-			width:100%;
-			border:solid black 0px;
-			background-color:#F5F5F5;
-		}
-		.popUp td {
-			font-size:9pt;	
-			font-family:arial;
-			border-top:solid #E0E0E0 1px;
-		}	
-		.popUp tr.clear td {
-			border-style:none;
-			background-color:#F0F0F0;
-		}
-		.popUp tr.clearNoBG td {
-			border-style:none;
-		}
-		.popUp td.header {
-			font-weight:bold;
-		}
-		a.saveBtn {
-			width:40px;
-			height:15px;
-			background-color:silver;
-			padding:1px;
-			padding-left:5px;
-			padding-right:5px;
-			color:white;
-			border:solid gray 1px;
-			text-decoration:none;
-			font-weight:bold;
-			display:block;
-			float:right;
-			text-align:center;
-		}
-		a.saveBtn:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_pm_view.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_pm_view.tmpl
deleted file mode 100644
index e7f4217f5..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_pm_view.tmpl
+++ /dev/null
@@ -1,150 +0,0 @@
-#ProjectManagerTMPL0001
-#title:Default Project Management System Dashboard
-#menuTitle:Default Project Management System Dashboard
-#url:default-pm-template-dashboard
-#namespace:ProjectManager_dashboard
-#create
-<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>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<script>
-   function doDelete(url) {
-      if( confirm('<tmpl_var project.delete.warning>') ) {
-	     location.href=url;
-	  }
-   }
-</script>
-
-<table cellpadding="3" cellspacing="0" border="0" class="projectView">
-   <tr>
-	   <td colspan="3" style="border-style:none;text-align:left;" valign="bottom">
-		   <a href="<tmpl_var project.create>"><tmpl_var project.create.label></a>
-	   </td>
-	   <td style="border-style:none;text-align:right" colspan="3">
-	      <form action="" style="margin:0px;">
-		     <p style="margin:0px;">
-			    <select>
-				   <option>All Projects</option>
-				</select>			
-			 </p>
-		  </form>
-	   </td>
-    </tr>
-
-    <tr class="header">
-	   <td><tmpl_var project.name.label></td>
-	   <td><tmpl_var project.startDate.label></td>
-	   <td><tmpl_var project.endDate.label></td>
-	   <td><tmpl_var project.cost.label></td>
-	   <td><tmpl_var project.complete.label></td>
-	   <tmpl_if canEditProjects>
-	      <td><tmpl_var project.actions.label></td>
-	   </tmpl_if>
-    </tr>
-	<tmpl_if noProjects>
-	   <tr><td class="projectNames" colspan="<tmpl_var empty.colspan>"><tmpl_var noProjects></td></tr>
-	<tmpl_else>
-	   <tmpl_loop project.loop>
-	      <tr class="alt">
-	         <td class="projectNames">
-			    <a href="<tmpl_var project.view.url>"><tmpl_var project.name.data></a>
-			 </td>
-	         <td><tmpl_var project.startDate.data></td>
-	         <td><tmpl_var project.endDate.data></td>
-	         <td><tmpl_var project.cost.data.int></td>
-	         <td>
-		        <div class="completeContainer">
-			       <div class="completeBar" style="width:<tmpl_var project.complete.data.int>%;"></div>
-			       <div class="completeText"><tmpl_var project.complete.data.float>%</div>
-		        </div>	
-	         </td>
-			 <tmpl_if canEditProjects>
-	            <td>
-			        <!-- <a href="#"><img src="<tmpl_var extras>/add.gif" style="border-style:none;" alt="" /></a>&nbsp; -->
-				   <a href="<tmpl_var project.edit.url>"><img src="<tmpl_var extras>/edit.gif" style="border-style:none;" title="<tmpl_var project.edit.title>" /></a>&nbsp;
-				   <a href="javascript:void(doDelete('<tmpl_var project.delete.url>'));"><img src="<tmpl_var extras>/delete.gif" style="border-style:none;" title="<tmpl_var project.delete.title>" /></a>
-			    </td>
-             </tmpl_if>
-		  </tr>
-	   </tmpl_loop>
-	</tmpl_if>
-</table>
-
-~~~
-<style type="text/css">
-   .fontSettings {
-	 font-family:arial;
-	 font-size:9pt;
-   }
-   
-   .projectView td {
-      border:solid silver 1px;
-	  border-bottom:solid gray 1px;
-	  font-size:9pt;
-	  font-family:arial;			
-   }
-   .projectView a {
-	  color:#3391DD;
-   }
-   tr.header td {
-	  font-weight:bold;
-   }
-   td.projectNames {
-	  white-space:nowrap;			
-   }
-   td.projectNames a {
-	  display:block;
-	  color:#3391DD;
-   }
-   td.projectNames a.level1 {
-	  margin:0 10px;			
-   }
-   td.projectNames a.level2 {
-	  margin:0px 10px 0px 20px;
-   }
-   td.projectNames a.level3 {
-	  margin:0px 10px 0px 30px;			
-   }	
-   td.projectNames a.level4 {
-	  margin:0px 10px 0px 40px;			
-   }		
-   td.projectNames a.level5 {
-      margin:0px 10px 0px 50px;			
-   }		
-   tr.alt td {
-	  background-color:#F0F0F0;
-   }
-   div.completeContainer {
-	  position:relative;
-	  z-index:0;
-	  background: #000;
-	  color:white;
-	  text-align:center;
-   }
-   div.completeBar {
-	  position:absolute;
-	  height:100%;
-	  top:0px;
-	  left:0px;
-	  background: #7AB7E9;
-	  z-index:1;
-   }
-   div.completeText {
-	  position:relative;
-	  height:100%;
-	  top:0px;
-	  left:0px;			
-	  z-index:2;			
-   }
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_poll.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_poll.tmpl
deleted file mode 100644
index db05e6eec..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_poll.tmpl
+++ /dev/null
@@ -1,68 +0,0 @@
-#PBtmpl0000000000000055
-
-<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>
-
-<div class="fontSettings">
-<tmpl_if description>
-	<tmpl_var description>
-	<p />
-</tmpl_if>
-
-<span class="pollQuestion"><tmpl_var question></span><br />
-
-<tmpl_if canVote>
-	<tmpl_var form.start>
-	<tmpl_loop answer_loop>
-		<tmpl_var answer.form> <tmpl_var answer.text><br />
-	</tmpl_loop>
-	<p />
-	<tmpl_var form.submit>
-	<tmpl_var form.end>
-<tmpl_else>
-	<tmpl_if hasImageGraph>
-		<img src="<tmpl_var graphUrl>" />
-	<tmpl_else>
-		<tmpl_loop answer_loop>
-			<span class="pollAnswer"><tmpl_var answer.text><br /></span>
-			<table cellpadding=0 cellspacing=0 border=0>
-			<tr>
-				<td width="<tmpl_var answer.graphWidth>" class="pollColor">^Spacer(1,1);</td>
-				<td class="pollAnswer">&nbsp;&nbsp;<tmpl_var answer.percent>% (<tmpl_var answer.total>)</td>
-			</tr>
-			</table>
-		</tmpl_loop>
-		<span class="pollAnswer"><hr size="1"><b><tmpl_var responses.label>:</b> <tmpl_var responses.total></span>
-	</tmpl_if>
-</tmpl_if>
-</div>
-
-
-~~~
-<style type="text/css">
-.fontSettings {
-	font-family:arial;
-	font-size:9pt;
-}
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.pollQuestion {
-	border-bottom:solid gray 1px;
-	font-family:arial;
-	font-size:10pt;
-	font-weight:bold;				
-}
-.pollColor {
-	background-color:gray;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_post_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_post_form.tmpl
deleted file mode 100644
index 419cf5cef..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_post_form.tmpl
+++ /dev/null
@@ -1,82 +0,0 @@
-#PBtmpl0000000000000029
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if preview.title>
-	<p><b><tmpl_var preview.title></b></p>
-</tmpl_if>
-
-<tmpl_if preview.content>
-	<p><tmpl_var preview.content></p>
-</tmpl_if>
-
-<h2><tmpl_var message.header.label></h2>
-
-<tmpl_var form.header>
-<table class="defaultPostForm">
-	<tmpl_if isNewPost>
-		<tmpl_if user.isVisitor>
-			<tr>
-				<td><tmpl_var visitorName.label></td>
-				<td><tmpl_var visitorName.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td><tmpl_var subject.label></td>
-		<td><tmpl_var title.form></td>
-	</tr>
-	<tr>
-		<td><tmpl_var message.label></td>
-		<td><tmpl_var content.form></td>
-	</tr>
-	<tmpl_if attachment.form>
-		<tr>
-			<td><tmpl_var attachment.label></td>
-			<td><tmpl_var attachment.form></td>
-		</tr>
-	</tmpl_if>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<p><b><tmpl_var reply.title></b></p>
-	<tmpl_var reply.content>
-</tmpl_if>
-
-
-~~~
-<style type="text/css">
-table.defaultPostForm td
-{
-	font-family:arial;
-	font-size:9pt;
-}
-h2
-{
-	font-family:arial;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_product.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_product.tmpl
deleted file mode 100644
index ff2b282a5..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_product.tmpl
+++ /dev/null
@@ -1,174 +0,0 @@
-#PBtmpl0000000000000056
-<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>
-
-<table width="100%" cellpadding="3" cellspacing="3" class="defaultProduct">
-<tr>
-	<td class="content" valign="top">
-		<tmpl_if description><tmpl_var description><p /></tmpl_if>
-		<tmpl_if price><b>Price:</b> <tmpl_var price><br /></tmpl_if>
-		<tmpl_if productnumber><b>Product Number:</b> <tmpl_var productNumber><br /></tmpl_if>
-		<br />
-		<tmpl_if brochure.url><a href="<tmpl_var brochure.url>"><img src="<tmpl_var brochure.icon>" alt="<tmpl_var brochure.icon>" border=0 align="absmiddle" /><tmpl_var brochure.label></a><br /></tmpl_if>
-		<tmpl_if manual.url><a href="<tmpl_var manual.url>"><img src="<tmpl_var manual.icon>" alt="<tmpl_var manual.icon>" border=0 align="absmiddle" /><tmpl_var manual.label></a><br /></tmpl_if>
-		<tmpl_if warranty.url><a href="<tmpl_var warranty.url>"><img src="<tmpl_var warranty.icon>" alt="<tmpl_var warranty.icon>" border=0 align="absmiddle" /><tmpl_var warranty.label></a><br /></tmpl_if>
-	</td>
-	<td valign="top" class="defaultProduct">
-		<tmpl_if thumbnail1><a href="<tmpl_var image1>"><img src="<tmpl_var thumbnail1>" alt="<tmpl_var thumbnail1>" class="noBorder" /></a><p /></tmpl_if>
-		<tmpl_if thumbnail2><a href="<tmpl_var image2>"><img src="<tmpl_var thumbnail2>" alt="<tmpl_var thumbnail2>" class="noBorder" /></a><p /></tmpl_if>
-		<tmpl_if thumbnail3><a href="<tmpl_var image3>"><img src="<tmpl_var thumbnail3>" alt="<tmpl_var thumbnail3>" class="noBorder" /></a><p /></tmpl_if>
-	</td>
-</tr>
-</table>
-
-<table border="0" cellpadding="3" cellspacing="5" class="defaultProduct">
-<tr>
-	<td valign="top" class="productFeature">
-		<div class="productFeatureHeader">Features</div>
-		<tmpl_if session.var.adminOn><a href="<tmpl_var addfeature.url>"><tmpl_var addfeature.label></a><p /></tmpl_if>
-		<tmpl_loop feature_loop>
-			<tmpl_if session.var.adminOn><tmpl_var feature.controls></tmpl_if>
-			<tmpl_var feature.feature><br />
-		</tmpl_loop>
-		<p />
-	</td>
-	<td valign="top" class="productBenefit">
-		<div class="productBenefitHeader">Benefits</div>
-		<tmpl_if session.var.adminOn><a href="<tmpl_var addBenefit.url>"><tmpl_var addBenefit.label></a><p /></tmpl_if>
-		<tmpl_loop benefit_loop>
-			<tmpl_if session.var.adminOn><tmpl_var benefit.controls></tmpl_if>
-			<tmpl_var benefit.benefit><br />
-		</tmpl_loop>
-		<p />
-	</td>
-	<td valign="top" class="productSpecification">
-		<div class="productSpecificationHeader">Specifications</div>
-		<tmpl_if session.var.adminOn><a href="<tmpl_var addSpecification.url>"><tmpl_var addSpecification.label></a><p /></tmpl_if>
-		<tmpl_loop specification_loop>
-			<tmpl_if session.var.adminOn><tmpl_var specification.controls></tmpl_if>
-			<b><tmpl_var specification.label>:</b> <tmpl_var specification.specification> <tmpl_var specification.units><br />
-		</tmpl_loop>
-		<p />
-	</td>
-	<td valign="top" class="productAccessory">
-		<div class="productAccessoryHeader">Accessories</div>
-		<tmpl_if session.var.adminOn><a href="<tmpl_var addaccessory.url>"><tmpl_var addaccessory.label></a><p /></tmpl_if>
-		<tmpl_loop accessory_loop>
-			<tmpl_if session.var.adminOn><tmpl_var accessory.controls></tmpl_if>
-			<a href="<tmpl_var accessory.url>"><tmpl_var accessory.title></a><br />
-		</tmpl_loop>
-		<p />
-	</td>
-	<td valign="top" class="productRelated">
-		<div class="productRelatedHeader">Related Products</div>
-		<tmpl_if session.var.adminOn><a href="<tmpl_var addRelatedProduct.url>"><tmpl_var addRelatedProduct.label></a><p /></tmpl_if>
-		<tmpl_loop relatedproduct_loop>
-			<tmpl_if session.var.adminOn><tmpl_var RelatedProduct.controls></tmpl_if>
-			<a href="<tmpl_var relatedproduct.url>"><tmpl_var relatedproduct.title></a><br />
-		</tmpl_loop>
-	</td>
-</tr>
-</table>
-
-
-~~~
-<style type="text/css">
-.productFeatureHeader {
-	font-weight: bold;
-	font-size: 15px;
-	width:100%;
-	border-bottom:solid gray 1px;
-	background-color:#DADADA;
-	padding-left:3px;
-	-moz-box-sizing:border-box;
-}
-.productSpecificationHeader {
-	font-weight: bold;
-	font-size: 15px;
-	width:100%;
-	border-bottom:solid gray 1px;
-	background-color:#DADADA;
-	padding-left:3px;
-	-moz-box-sizing:border-box;
-}
-.productRelatedHeader {
-	font-weight: bold;
-	font-size: 15px;
-	width:100%;
-	border-bottom:solid gray 1px;
-	background-color:#DADADA;
-	padding-left:3px;
-	-moz-box-sizing:border-box;
-}
-.productAccessoryHeader{
-	font-weight: bold;
-	font-size: 15px;
-	width:100%;
-	border-bottom:solid gray 1px;
-	background-color:#DADADA;
-	padding-left:3px;
-	-moz-box-sizing:border-box;
-}
-.productBenefitHeader {
-	font-weight: bold;
-	font-size: 15px;
-	width:100%;
-	border-bottom:solid gray 1px;
-	background-color:#DADADA;
-	padding-left:3px;
-	-moz-box-sizing:border-box;
-}
-.productFeature {
-	font-size: 12px;
-	border-right:solid gray 1px;
-	width:20%;
-}
-.productSpecification {
-	font-size: 12px;
-	border-right:solid gray 1px;
-	width:20%;
-}
-.productRelated {
-	font-size: 12px;
-	border-right:solid gray 1px;
-	width:20%;
-}
-.productAccessory {
-	font-size: 12px;
-	border-right:solid gray 1px;
-	width:20%;
-}
-.productBenefit {
-	font-size: 12px;
-	border-right:solid gray 1px;
-	width:20%;
-}
-.productAttributeSeperator {
-	background-color: black;
-}
-.noBorder {
-	border:none;
-}
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.defaultProduct {
-	border:solid gray 1px;
-}
-.defaultProduct td {
-	font-family:arial;
-	font-size:9pt;
-}
-.defaultProduct a {
-	color:#29587E;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_product_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_product_template.tmpl
deleted file mode 100644
index f5a3eba5c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_product_template.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-#PBtmplCP00000000000001
-<h2><tmpl_var title></h2>
-<tmpl_var description><br />
-<br />
-<tmpl_var variants.message><br />
-
-<table>
-	<tmpl_loop variantLoop>
-	<tr>
-		<td style="text-indent: 40px;">
-		<tmpl_loop variant.compositionLoop>
-			<tmpl_var parameter>: <tmpl_var value><tmpl_unless __LAST__>,</tmpl_unless>
-		</tmpl_loop>
-		</td>
-		<td>$ <tmpl_var variant.price></td>
-		<td><a href="<tmpl_var variant.addToCart.url>"><tmpl_var variant.addToCart.label></a></td>
-	</tr>
-	</tmpl_loop>
-</table>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_profile_display_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_profile_display_template.tmpl
deleted file mode 100644
index a97915d25..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_profile_display_template.tmpl
+++ /dev/null
@@ -1,49 +0,0 @@
-#PBtmpl0000000000000052
-<h2><tmpl_var displayTitle></h2>
-
-<table>
-  <tmpl_loop profile.elements>
-
-    <tmpl_if profile.category>
-	<tr>
-	  <td colspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-      <td colspan="2" class="tableHeader">
-        <tmpl_var profile.category>
-      </td>
-	</tr>
-    <tmpl_else>
-	<tr>
-      <td class="tableCategory">
-         <tmpl_var profile.label>
-      </td>
-      <td class="tableData">
-         <tmpl_var profile.value>
-      </td>    
-	</tr>
-    </tmpl_if>   
-
-  </tmpl_loop>
-</table>
-<div class="accountOptions">
-   <ul>
-      <tmpl_loop profile.accountOptions>
-         <li><tmpl_var options.display></li>
-      </tmpl_loop>
-   </ul>
-</div>
-~~~
-<style type="text/css">
-.tableHeader {
-	background-color:#F0F0F0;
-	border-bottom:solid gray 1px;
-	font-weight:bold;	
-}
-.tableCategory {
-	background-color:#F0F0F0;	
-}
-.tableData {
-	border-bottom:solid #F0F0F0 1px;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_response.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_response.tmpl
deleted file mode 100644
index d0bb8adab..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_response.tmpl
+++ /dev/null
@@ -1,39 +0,0 @@
-#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_select_shipping_method_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_select_shipping_method_template.tmpl
deleted file mode 100644
index 8a7907498..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_select_shipping_method_template.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-#PBtmplCSSM000000000001
-<tmpl_if pluginsAvailable>
-   <tmpl_var message><br />
-    <tmpl_var formHeader>
-       <table border="0" cellspacing="0" cellpadding="5">
-    <tmpl_loop pluginLoop>
-            <tr>
-                        <td><tmpl_var formElement></td>
-                     <td align="left"><tmpl_var name></td>
-           </tr>
-       </tmpl_loop>
-        </table>
-    <tmpl_var formSubmit>
-    <tmpl_var formFooter>
-<tmpl_else>
- <tmpl_var noPluginsMessage>
-</tmpl_if>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_shoppingcart_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_shoppingcart_template.tmpl
deleted file mode 100644
index fd76bd623..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_shoppingcart_template.tmpl
+++ /dev/null
@@ -1,51 +0,0 @@
-#PBtmplVSC0000000000001
-<tmpl_if cartEmpty>
-<tmpl_var cartEmpty.message>
-<tmpl_else>
-
-<tmpl_var updateForm.header>
-<table>	
-	<tr align="left">
-		<th></th>
-		<th style="border-bottom: 2px solid black">Product</th>
-		<th style="border-bottom: 2px solid black">Quantity</th>
-		<th style="border-bottom: 2px solid black">Price</th>
-	</tr>
-
-	<tmpl_if normalItems>
-	</tmpl_if>
-
-	<tmpl_loop normalItemsLoop>
-	<tr>
-		<td><tmpl_var deleteIcon></td>
-		<td align="left"><tmpl_var name></td>
-		<td align="center"><tmpl_var quantity.form></td>
-		<td align="right"><tmpl_var price></td>
-	</tr>
-	</tmpl_loop>
-
-	<tmpl_loop recurringItemsLoop>
-	<tr>
-		<td><tmpl_var deleteIcon></td>
-		<td align="left"><tmpl_var name></td>
-		<td align="center"><tmpl_var quantity.form></td>
-		<td align="right"><tmpl_var price></td>
-	</tr>
-</tmpl_loop>
-	<tr style="border-top: 1px solid black">
-		<td></td>
-		<td style="border-top: 1px solid black">&nbsp;</td>
-		<td align="right" style="border-top: 1px solid black"><b>Total</b></td>
-		<td align="right" colspan="3" style="border-top: 1px solid black"><b><tmpl_var total></b></td>
-	</tr>
-
-</table>
-
-<tmpl_var updateForm.button>
-<tmpl_var updateForm.footer>
-
-<tmpl_var checkoutForm.header>
-<tmpl_var checkoutForm.button>
-<tmpl_var checkoutForm.footer> 
-
-</tmpl_if>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_sql_report.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_sql_report.tmpl
deleted file mode 100644
index 6640b32f5..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_sql_report.tmpl
+++ /dev/null
@@ -1,156 +0,0 @@
-#PBtmpl0000000000000059
-<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 debugMode>
-	<ul>
-	<tmpl_loop debug_loop>
-		<li><tmpl_var debug.output></li>
-	</tmpl_loop>
-	</ul>
-</tmpl_if>
-
-<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-<tr>
-<tmpl_loop columns_loop>
-	<td class="tableHeader"><tmpl_var column.name></td>
-</tmpl_loop>
-</tr>
-<tmpl_loop rows_loop>
-	<tr>
-	<tmpl_loop row.field_loop>
-		<td class="tableData"><tmpl_var field.value></td>
-	</tmpl_loop>
-	</tr>
-	<!-- Handle nested query2 -->
-	<tmpl_if hasNest>
-		<tr>
-		<td colspan="<tmpl_var columns.count>">
-		<table width="100%" cellspacing="0" cellpadding="0">
-		<tr>
-		<td width="20">&nbsp;</td>
-		<td>
-		<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-		<tr>
-		<tmpl_loop query2.columns_loop>
-			<td class="tableHeader"><tmpl_var column.name></td>
-		</tmpl_loop>
-		</tr>
-		<tmpl_loop query2.rows_loop>
-			<tr>
-			<tmpl_loop query2.row.field_loop>
-				<td class="tableData"><tmpl_var field.value></td>
-			</tmpl_loop>
-			</tr>
-			<!-- Handle nested query3 -->
-			<tmpl_if query2.hasNest>
-				<tr>
-				<td colspan="<tmpl_var query2.columns.count>">
-				<table width="100%" cellspacing="0" cellpadding="0">
-				<tr>
-				<td style="width:20px;">&nbsp;</td>
-				<td>
-				<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-				<tr>
-				<tmpl_loop query3.columns_loop>
-					<td class="tableHeader"><tmpl_var column.name></td>
-				</tmpl_loop>
-				</tr>
-				<tmpl_loop query3.rows_loop>
-					<tr>
-					<tmpl_loop query3.row.field_loop>
-						<td class="tableData"><tmpl_var field.value></td>
-					</tmpl_loop>
-					</tr>
-		   			<!-- Handle nested query4 -->
-					<tmpl_if query3.hasNest>
-						<tr>
-						<td colspan="<tmpl_var query3.columns.count>">
-						<table width="100%" cellspacing="0" cellpadding="0">
-						<tr>
-						<td style="width:20px;">&nbsp;</td>
-						<td>
-						<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-						<tr>
-						<tmpl_loop query4.columns_loop>
-							<td class="tableHeader"><tmpl_var column.name></td>
-						</tmpl_loop>
-						</tr>
-						<tmpl_loop query4.rows_loop>
-							<tr>
-							<tmpl_loop query4.row.field_loop>
-								<td class="tableData"><tmpl_var field.value></td>
-							</tmpl_loop>
-				   			<!-- Handle nested query5 -->
-							<tmpl_if query4.hasNest>
-								<tr>
-								<td colspan="<tmpl_var query4.columns.count>">
-								<table width="100%" cellspacing="0" cellpadding="0">
-								<tr>
-								<td style="width:20px;">&nbsp;</td>
-								<td>
-								<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-								<tr>
-								<tmpl_loop query5.columns_loop>
-									<td class="tableHeader"><tmpl_var column.name></td>
-								</tmpl_loop>
-								</tr>
-								<tmpl_loop query5.rows_loop>
-									<tr>
-									<tmpl_loop query5.row.field_loop>
-										<td class="tableData"><tmpl_var field.value></td>
-									</tmpl_loop>
-									</tr>
-								</tmpl_loop>
-								</table>
-								</td>
-								</tr>
-								</table>
-						        	</td>
-				        			</tr>
-							</tmpl_if>
-							</tr>
-						</tmpl_loop>
-						</table>
-						</td>
-						</tr>
-						</table>
-				        	</td>
-				        	</tr>
-					</tmpl_if>
-				</tmpl_loop>
-				</table>
-				</td>
-				</tr>
-				</table>
-			        </td>
-			        </tr>
-			</tmpl_if>
-		</tmpl_loop>
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-	</tmpl_if>
-</tmpl_loop>
-</table>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> <tmpl_var pagination.pageList.upTo20> <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_submission.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_submission.tmpl
deleted file mode 100644
index 66c520087..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_submission.tmpl
+++ /dev/null
@@ -1,358 +0,0 @@
-#PBtmpl0000000000000067
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<div class="defaultSubmissionDetails">
-	<b><tmpl_var user.label>:</b> 
-		<tmpl_if user.isVisitor>
-			<tmpl_var username>
-		<tmpl_else>
-			<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-		</tmpl_if>
-		<br />
-	<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-	<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-	<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-		<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-		</tmpl_unless>
-		<br />
-	<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	<tmpl_else>	
-		<tmpl_if user.isPoster>
-			<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-		</tmpl_if>	
-	</tmpl_if>	
-</div>
-
-<div class="collaborationThreadContent">
-	<tmpl_var content>
-</div>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-<tmpl_if userDefined1>
-	<p><tmpl_var userDefined1></p>
-</tmpl_if>
-
-<tmpl_if userDefined2>
-	<p><tmpl_var userDefined2></p>
-</tmpl_if>
-	
-<tmpl_if userDefined3>
-	<p><tmpl_var userDefined3></p>
-</tmpl_if>
-
-<tmpl_if userDefined4>
-	<p><tmpl_var userDefined4></p>
-</tmpl_if>
-
-<tmpl_if userDefined5>
-	<p><tmpl_var userDefined5></p>
-</tmpl_if>
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<tmpl_if repliesAllowed>
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<div style="float: left; width: 50%">
-							<b><tmpl_var user.label>:</b> 
-								<tmpl_if user.isVisitor>
-									<tmpl_var username>
-								<tmpl_else>
-									<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-								</tmpl_if>
-								<br />
-							<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-						</div>	
-						<div>
-							<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-							<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<tmpl_if user.isPoster>
-									<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-								</tmpl_if>	
-						</div>	
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-							<div style="float: left; width: 50%">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-							</div>	
-							<div>
-								<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-									<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-									</tmpl_unless>
-									<br />
-									<tmpl_if user.isPoster>
-										<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-									</tmpl_if>	
-							</div>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>
-	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a>				
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-
-
-~~~
-<style type="text/css">
-.defaultSubmissionDetails
-{
-	float: right; 		
-	padding: 2px; 
-	margin: 2px;
-	font-size:9pt;
-	font-family:arial;
-}
-
-.defaultSubmissionDetails a
-{
-	color:#29587E;
-}
-
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.postControls {
-	border-top: 1px solid #cccccc;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.threadData {
-	font-size: 11px;
-	padding: 3px;
-	font-family:arial;
-}
-
-.postControls
-{
-	background:#C0C0C0;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-
-.postControls a
-{
-	color:white;
-}
-
-.collaborationThreadContent
-{
-	height:100px;
-	font-family:arial;
-	font-size:9pt;
-}
-
-#mainText > .collaborationThreadContent
-{
-	height:auto;
-	min-height:100px;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_submission_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_submission_form.tmpl
deleted file mode 100644
index fe360dc9c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_submission_form.tmpl
+++ /dev/null
@@ -1,108 +0,0 @@
-#PBtmpl0000000000000068
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
-<tmpl_unless isReply><tmpl_if preview.synopsis><p><i><tmpl_var preview.synopsis></i></p></tmpl_if></tmpl_unless>
-<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
-
-<tmpl_if isReply>
-	<h1><tmpl_var message.header.label></h1>
-<tmpl_else>
-	<h1><tmpl_var submission.header.label></h1>
-</tmpl_if>
-
-<tmpl_var form.header>
-<table class="defaultSubmissionForm">
-	<tmpl_if isNewPost>
-		<tmpl_if user.isVisitor>
-			<tr>
-				<td><tmpl_var visitorName.label></td>
-				<td><tmpl_var visitorName.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td><tmpl_var title.label></td>
-		<td><tmpl_var title.form></td>
-	</tr>
-	<tmpl_unless isReply>
-		<tr>
-			<td><tmpl_var synopsis.label></td>
-			<td><tmpl_var synopsis.form></td>
-		</tr>
-	</tmpl_unless>
-	<tr>
-		<td><tmpl_var body.label></td>
-		<td><tmpl_var content.form></td>
-	</tr>
-	<tmpl_unless isReply>
-		<tmpl_if attachment.form>
-			<tr>
-				<td><tmpl_var attachment.label></td>
-				<td><tmpl_var attachment.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless isReply>
-		<tr>
-			<td><tmpl_var startDate.label></td>
-			<td><tmpl_var startDate.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var endDate.label></td>
-			<td><tmpl_var endDate.form></td>
-		</tr>
-	</tmpl_unless>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<div class="defaultSubmissionFormContent">
-	<b><tmpl_var reply.title></b><br /><br />
-	<tmpl_var reply.content>
-	</div>
-</tmpl_if>
-
-
-~~~
-<style type="text/css">
-table.defaultSubmissionForm td
-{
-	font-family:arial;
-	font-size:9pt;
-}
-.defaultSubmissionFormContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-h2
-{
-	font-family:arial;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_survey.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_survey.tmpl
deleted file mode 100644
index 4497c7365..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_survey.tmpl
+++ /dev/null
@@ -1,113 +0,0 @@
-#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
deleted file mode 100644
index b5748134c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_syndicated_content.tmpl
+++ /dev/null
@@ -1,43 +0,0 @@
-#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_default_thread.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_thread.tmpl
deleted file mode 100755
index 3c548d599..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_thread.tmpl
+++ /dev/null
@@ -1,220 +0,0 @@
-#PBtmpl0000000000000032
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-	
-<div style="float: left; width: 70%">
-	<h2><a href="<tmpl_var collaboration.url>"><tmpl_var collaboration.title></a></h2>
-</div>
-<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-</div>
-<div style="clear: both;"></div>
-
-<tmpl_if layout.isFlat>
-<!-- begin flat layout -->
-	<tmpl_loop post_loop>
-		<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-			<a name="<tmpl_var assetId>"></a>
-			<div class="postSubject">
-				<tmpl_var title>
-			</div>
-			<div class="postData">
-				<div style="float: left; width: 50%">
-					<b><tmpl_var user.label>:</b> 
-						<tmpl_if user.isVisitor>
-							<tmpl_var username>
-						<tmpl_else>
-							<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-						</tmpl_if>
-						<br />
-					<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-				</div>	
-				<div>
-					<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-					<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-						<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-						</tmpl_unless>
-						<br />
-					<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-					<tmpl_else>	
-						<tmpl_if user.isPoster>
-							<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-						</tmpl_if>	
-					</tmpl_if>	
-				</div>	
-			</div>
-			<div class="postMessage">
-				<tmpl_var content>
-<tmpl_loop attachment_loop>
-	<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-</tmpl_loop>
-<div style="clear: both;"></div>
-
-			</div>
-			<tmpl_unless isLocked>
-				<div class="postControls">
-					<tmpl_if user.canReply>
-						<a href="<tmpl_var reply.url>">[<tmpl_var reply.label>]</a>
-					</tmpl_if>
-					<tmpl_if user.canEdit>
-						<a href="<tmpl_var edit.url>">[<tmpl_var edit.label>]</a>
-						<a href="<tmpl_var delete.url>">[<tmpl_var delete.label>]</a>
-					</tmpl_if>
-				</div>
-			</tmpl_unless>
-		</div>
-	</tmpl_loop>
-<!-- end flat layout -->
-</tmpl_if>
-
-<tmpl_if layout.isNested>
-<!-- begin nested layout -->
-	<tmpl_loop post_loop>
-		<div style="margin-left: <tmpl_var depthX10>px;">
-			<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-				<a name="<tmpl_var assetId>"></a>
-				<div class="postSubject">
-					<tmpl_var title>
-				</div>
-				<div class="postData">
-					<div style="float: left; width: 50%">
-						<b><tmpl_var user.label>:</b> 
-							<tmpl_if user.isVisitor>
-								<tmpl_var username>
-							<tmpl_else>
-								<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-							</tmpl_if>
-							<br />
-						<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-					</div>	
-					<div>
-						<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-						<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-							<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-							</tmpl_unless>
-							<br />
-							<tmpl_if user.isPoster>
-								<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-							</tmpl_if>	
-					</div>	
-				</div>
-				<div class="postMessage">
-					<tmpl_var content>
-<tmpl_loop attachment_loop>
-	<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-</tmpl_loop>
-<div style="clear: both;"></div>
-
-				</div>
-				<tmpl_unless isLocked>
-					<div class="postControls">
-						<tmpl_if user.canReply>
-							<a href="<tmpl_var reply.url>">[<tmpl_var reply.label>]</a>
-						</tmpl_if>
-						<tmpl_if user.canEdit>
-							<a href="<tmpl_var edit.url>">[<tmpl_var edit.label>]</a>
-							<a href="<tmpl_var delete.url>">[<tmpl_var delete.label>]</a>
-						</tmpl_if>
-					</div>
-				</tmpl_unless>
-			</div>
-		</div>
-	</tmpl_loop>
-<!-- end nested layout -->
-</tmpl_if>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination" style="margin-top: 20px;">
-		[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-	</div>
-</tmpl_if>
-
-<div style="margin-top: 20px;">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>">[<tmpl_var previous.label>]</a> 
-	</tmpl_if>	
-	<tmpl_if next.url>
-		<a href="<tmpl_var next.url>">[<tmpl_var next.label>]</a> 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>">[<tmpl_var unstick.label>]</a>
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>">[<tmpl_var stick.label>]</a>
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>">[<tmpl_var unlock.label>]</a>
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>">[<tmpl_var lock.label>]</a>
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-	.postBorder {
-		border: 1px solid #cccccc;
-		margin-bottom: 10px;
-	}
- 	.postBorderCurrent {
-		border: 3px dotted black;
-		margin-bottom: 10px;
-	}
-	.postSubject {
-		border-bottom: 1px solid #cccccc;
-		font-weight: bold;
-		padding: 3px;
-	}
-	.postData {
-		border-bottom: 1px solid #cccccc;
-		font-size: 11px;
-		background-color: #eeeeee;
-		color: black;
-		padding: 3px;
-	}
-	.postControls {
-		border-top: 1px solid #cccccc;
-		background-color: #eeeeee;
-		color: black;
-		padding: 3px;
-	}
-	.postMessage {
-		padding: 3px;
-	}
-	.currentThread {
-		background-color: #eeeeee;
-	}
-	.threadHead {
-		font-weight: bold;
-		border-bottom: 1px solid #cccccc;
-		font-size: 11px;
-		background-color: #eeeeee;
-		color: black;
-		padding: 3px;
-	}
-	.threadData {
-		font-size: 11px;
-		padding: 3px;
-	}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_transaction_error_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_transaction_error_template.tmpl
deleted file mode 100644
index 05db0c44d..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_transaction_error_template.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-#PBtmpl0000000000000018
-<table border="1" cellpadding="5" cellspacing="0">
-  <tr>
-    <th>Transaction description</th>
-    <th>Price</th>
-    <th>Status</th>
-    <th>Error</th>
-  </tr>
-<tmpl_loop resultLoop>
-  <tr>
-    <td align="left"><tmpl_var purchaseDescription></td>
-    <td align="right"><tmpl_var purchaseAmount></td>
-    <td><tmpl_var status></td>
-    <td align="left"><tmpl_var error> (<tmpl_var errorCode>)</td>
-  </tr>
-</tmpl_loop>
-</table><br />
-<br />
-
-<tmpl_var statusExplanation>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_tt_manager.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_tt_manager.tmpl
deleted file mode 100644
index 281cdd43e..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_tt_manager.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-#TimeTrackingTMPL000002
-#title:Default Time Tracking Manager View
-#menuTitle:Default Time Tracking Manager View
-#url:default-tt-template-manager
-#namespace:TimeTracking_manager
-#create
-
-This is the Manager's View
-
-~~~
-	
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_tt_row.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_tt_row.tmpl
deleted file mode 100644
index 7c331aeb6..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_tt_row.tmpl
+++ /dev/null
@@ -1,51 +0,0 @@
-#TimeTrackingTMPL000003
-#title:Default Time Tracking Row Template
-#menuTitle:Default Time Tracking Row Template
-#url:default-tt-template-row
-#namespace:TimeTracking_row
-#create
-
-<table class="timeTracking02" cellpadding="3" cellspacing="0">
-   <tr class="title">
-      <td colspan="4" align="left"><tmpl_var time.report.header></td>
-	  <td colspan="2" align="right"><tmpl_var time.report.hours.label> <b style="color:red;">0</b></td>
-   </tr>
-   <tr class="header" id="header">
-      <td width="10%"><tmpl_var time.report.date.label></td>
-	  <td width="20%"><tmpl_var time.report.project.label></td>
-	  <td width="20%"><tmpl_var time.report.task.label></td>
-	  <td width="10%"><tmpl_var time.report.hours.label></td>
-	  <td width="40%"><tmpl_var time.report.comments.label></td>
-	  <td>&#160;</td>
-   </tr>
-   <tmpl_loop time.entry.loop>
-      <tr id="<tmpl_var row.id>">
-         <td class="cell"><tmpl_var form.date></td>
-         <td class="cell"><tmpl_var form.project></td>
-         <td class="cell"><tmpl_var form.task></td>
-         <td class="cell"><tmpl_var form.hours></td>
-         <td class="cell"><tmpl_var form.comments></td>
-         <td><img src="<tmpl_var extras>/delete.gif" /></td>
-      </tr>
-   </tmpl_loop>
-   <tr class="empty">
-      <td colspan="6" style="border-top:solid gray 2px;">
-	      <table width="100%">
-		     <tr>
-			    <td width="60%" align="left">
-				   Report Complete<input type="checkbox" /> 
-				</td>
-				<td width="40%" align="right">
-					<input type="button" value="Add Row" /> &#160; <input type="button" value="Save" />
-			    </td>			
-		     </tr>
-	      </table>		
-	   </td>
-   </tr>
-</table>
-
-
-
-
-~~~
-	
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_tt_view.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_tt_view.tmpl
deleted file mode 100644
index 89da5494b..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_tt_view.tmpl
+++ /dev/null
@@ -1,54 +0,0 @@
-#TimeTrackingTMPL000001
-#title:Default Time Tracking User View
-#menuTitle:Default Time Tracking User View
-#url:default-tt-template-user
-#namespace:TimeTracking_user
-#create
-<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>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<script language="JavaScript">
-   var rowTotal = <tmpl_var time.report.rows.total>;
-</script>
-
-<p><tmpl_if project.manage.url><a href="<tmpl_var project.manage.url>"><tmpl_var project.manage.label></a></tmpl_if></p>
-<tmpl_var form.header>
-<tmpl_var form.timetracker>
-<tmpl_var form.footer>
-
-~~~
-	<style type="text/css">
-		.timeTracking02 {			
-			width:750px;
-		}
-		.timeTracking02 td {
-			border:solid silver 1px;
-			border-bottom:solid gray 1px;
-			font-size:9pt;
-			font-family:arial;			
-		}
-		tr.title td {
-			font-weight:bold;			
-			background-color:#F0F0F0;
-			border-style:none;
-			font-size:11pt;
-		}
-		tr.header td {
-			font-weight:bold;
-			text-align:center;		
-		}
-		tr.empty td {
-			border-style:none;
-		}
-	</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_uss.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_uss.tmpl
deleted file mode 100755
index d47c71663..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_uss.tmpl
+++ /dev/null
@@ -1,88 +0,0 @@
-#PBtmpl0000000000000066
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&#149;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&#149;
-	</tmpl_unless>
-	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-</p>
-
-<table width="100%">
-<tr>
-	<tmpl_if user.isModerator>
-		<td class="forumHead"><tmpl_var status.label></td>
-	</tmpl_if>
-	<td class="forumHead"><a href="<tmpl_var sortby.title.url>"><tmpl_var title.label></a></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.date.url>"><tmpl_var date.label></a></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.username.url>"><tmpl_var by.label></a></td>
-</tr>
-<tmpl_loop post_loop>
-<tr>
-	<tmpl_if user.isModerator>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var status></td>
-	</tmpl_if>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a><tmpl_if user.isPoster> (<tmpl_var status>)</tmpl_if></td>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateUpdated.human></td>
-	<tmpl_if user.isVisitor>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var username></td>
-	<tmpl_else>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var userProfile.url>"><tmpl_var username></a></td>
-	</tmpl_if>
-</tr>
-</tmpl_loop>
-</table>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-
-.forumHead {
-	background-color: #eeeeee;
-	border-bottom: 1px solid #cccccc;
-	padding: 2px;
-	padding-bottom: 4px;
-	font-size: 13px;
-	font-weight: bold;
-}
-
-.oddThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #83cc83;
-	padding-bottom: 4px;
-}
-
-.evenThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #aaaaff;
-	padding-bottom: 4px;
-}
-
-</style>
-
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_view_purchase_history_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_view_purchase_history_template.tmpl
deleted file mode 100644
index 69a924ea0..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_view_purchase_history_template.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-#PBtmpl0000000000000019
-<table border="0">
-<tmpl_loop purchaseHistoryLoop>
-	<tr>
-		<td><b><tmpl_var initDate></b></td>
-		<td><b><tmpl_var completionDate></b></td>
-		<td align="right"><b>$ <tmpl_var amount></b></td>
-		<td><b><tmpl_var status></b></td>
-		<td><tmpl_if canCancel><a href="<tmpl_var cancelUrl>">Cancel</a></tmpl_if></td>
-	</tr>
-	<tmpl_loop itemLoop>
-	<tr>
-		<td "align=right"><tmpl_var quantity> x </td>
-		<td "align=left"><tmpl_var itemName></td>
-		<td "align=right">$ <tmpl_var amount></td>
-	</tr>
-	</tmpl_loop>
-</tmpl_loop>
-</table>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_account_display_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_account_display_template.tmpl
deleted file mode 100644
index cfc399fe2..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_account_display_template.tmpl
+++ /dev/null
@@ -1,41 +0,0 @@
-#PBtmpl0000000000000010
-<h2><tmpl_var title></h2>
-
-<tmpl_if account.message>
-	<tmpl_var account.message>
-</tmpl_if>
-
-<tmpl_var account.form.header>
-<table>
-<tmpl_if account.form.karma>
-<tr>
-	<td class="formDescription" valign="top"><tmpl_var account.form.karma.label></td>
-	<td class="tableData"><tmpl_var account.form.karma></td>
-</tr>
-</tmpl_if>
-<tr>
-	<td class="formDescription" valign="top"><tmpl_var account.form.username.label></td>
-	<td class="tableData"><tmpl_var account.form.username></td>
-</tr>
-<tr>
-	<td class="formDescription" valign="top"><tmpl_var account.form.password.label></td>
-	<td class="tableData"><tmpl_var account.form.password></td>
-</tr>
-<tr>
-	<td class="formDescription" valign="top"><tmpl_var account.form.passwordConfirm.label></td>
-	<td class="tableData"><tmpl_var account.form.passwordConfirm></td>
-</tr>
-<tr>
-	<td class="formDescription" valign="top"></td>
-	<td class="tableData"><tmpl_var account.form.submit></td>
-</tr>
-</table>
-<tmpl_var account.form.footer>
-
-<div class="accountOptions">
-	<ul>
-		<tmpl_loop account.options>
-			<li><tmpl_var options.display></li>
-		</tmpl_loop>
-	</ul>
-</div>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_anonymous_registration_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_anonymous_registration_template.tmpl
deleted file mode 100644
index 7009774dd..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_anonymous_registration_template.tmpl
+++ /dev/null
@@ -1,57 +0,0 @@
-#PBtmpl0000000000000011
-<h2><tmpl_var title></h2>
-
-<tmpl_if create.message>
-   <tmpl_var create.message>
-</tmpl_if>
-
-<tmpl_var create.form.header>
-<table >
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var create.form.username.label></td>
-   <td class="tableData"><tmpl_var create.form.username></td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var create.form.password.label></td>
-   <td class="tableData"><tmpl_var create.form.password></td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var create.form.passwordConfirm.label></td>
-   <td class="tableData"><tmpl_var create.form.passwordConfirm></td>
-</tr>
-<tmpl_loop create.form.profile>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var profile.formElement.label></td>
-   <td class="tableData"><tmpl_var profile.formElement></td>
-</tr>
-</tmpl_loop>
-<tmpl_if useCaptcha>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var create.form.captcha.label></td>
-   <td class="tableData"><tmpl_var create.form.captcha></td>
-</tr>
-</tmpl_if>
-<tr>
-	<td colspan="2">&nbsp;</td>
-</tr>
-<tr>
-   <td class="submitData" colspan="2"><tmpl_var create.form.submit></td>
-</tr>
-</table>
-<tmpl_var create.form.footer>
-
-<div class="accountOptions">
-   <ul>
-      <li><a href="<tmpl_var login.url>"><tmpl_var login.label></a></li>
-      <tmpl_if recoverPassword.isAllowed>
-	     <li><a href="<tmpl_var recoverPassword.url>"><tmpl_var recoverPassword.label></a></li>
-	  </tmpl_if>
-   </ul>
-</div>
-~~~
-<style type="text/css">
-	.submitData {
-		text-align:right;
-		border-top:solid gray 1px;
-	}
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_login_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_login_template.tmpl
deleted file mode 100644
index 05bb8a202..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_login_template.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-#PBtmpl0000000000000013
-<h2>
-   <tmpl_var title>
-</h2>
-
-<tmpl_if login.message>
-   <tmpl_var login.message>
-</tmpl_if>
-
-<tmpl_var login.form.header>
-<table >
-<tmpl_var login.form.hidden>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var login.form.username.label></td>
-   <td class="tableData"><tmpl_var login.form.username></td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var login.form.password.label></td>
-   <td class="tableData"><tmpl_var login.form.password></td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top"></td>
-   <td class="tableData"><tmpl_var login.form.submit></td>
-</tr>
-</table>
-<tmpl_var login.form.footer>
-
-<div class="accountOptions">
-   <ul>
-     <tmpl_if recoverPassword.isAllowed>
-	     <li><a href="<tmpl_var recoverPassword.url>"><tmpl_var recoverPassword.label></a></li>
-	  </tmpl_if>
-           <tmpl_if anonymousRegistration.isAllowed>
-	     <li><a href="<tmpl_var createAccount.url>"><tmpl_var createAccount.label></a></li>
-	  </tmpl_if>
-   </ul>
-</div>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_password_recovery_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_password_recovery_template.tmpl
deleted file mode 100644
index ef4a6505c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_password_recovery_template.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-#PBtmpl0000000000000014
-<h2>
-   <tmpl_var title>
-</h2>
-
-
-<tmpl_if recover.message>
-   <tmpl_var recover.message>
-</tmpl_if>
-
-<tmpl_var recover.form.header>
-<tmpl_var recover.form.hidden>
-<table>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var recover.form.email.label></td>
-   <td class="tableData"><tmpl_var recover.form.email></td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top"></td>
-   <td class="tableData"><tmpl_var recover.form.submit></td>
-</tr>
-</table>
-<tmpl_var recover.form.footer>
-
-
-<div class="accountOptions">
-   <ul>
-       <tmpl_if anonymousRegistration.isAllowed>
-	     <li><a href="<tmpl_var createAccount.url>"><tmpl_var createAccount.label></a></li>
-	  </tmpl_if>
-         <li><a href="<tmpl_var login.url>"><tmpl_var login.label></a></li>
-      
-   </ul>
-</div>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_password_reset_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_password_reset_template.tmpl
deleted file mode 100644
index 545e976d3..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_password_reset_template.tmpl
+++ /dev/null
@@ -1,44 +0,0 @@
-#PBtmpl0000000000000012
-<h2>
-   <tmpl_var title>
-</h2>
-
-<tmpl_if expired.message>
-   <tmpl_var expired.message>
-</tmpl_if>
-
-<tmpl_var expired.form.header>
-<table >
-<tmpl_var expired.form.hidden>
-<tr>
-   <td class="formDescription" valign="top">
-      <tmpl_var expired.form.oldPassword.label>
-   </td>
-   <td class="tableData">
-      <tmpl_var expired.form.oldPassword>
-   </td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top">
-      <tmpl_var expired.form.password.label>
-   </td>
-   <td class="tableData">
-      <tmpl_var expired.form.password>
-   </td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top">
-  <tmpl_var expired.form.passwordConfirm.label>
-   </td>
-   <td class="tableData">
-   <tmpl_var expired.form.passwordConfirm>
-   </td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top"></td>
-   <td class="tableData">
-   <tmpl_var expired.form.submit>
-   </td>
-</tr>
-</table>
-<tmpl_var expired.form.footer>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_yes_no_prompt.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_yes_no_prompt.tmpl
deleted file mode 100644
index 59a19c262..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_webgui_yes_no_prompt.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
-#PBtmpl0000000000000057
-<h2><tmpl_var title></h2>
-
-<p>
-<tmpl_var question>
-</p>
-
-<div style="text-align:center">
-
-<a href="<tmpl_var yes.url>"><tmpl_var yes.label></a>
-
-&nbsp;  &nbsp; &nbsp; &nbsp; &nbsp; 
-
-<a href="<tmpl_var no.url>"><tmpl_var no.label></a>
-
-</div>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_dropmenu.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_dropmenu.tmpl
deleted file mode 100644
index 3a15f73f5..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_dropmenu.tmpl
+++ /dev/null
@@ -1,30 +0,0 @@
-#PBtmpl0000000000000117
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<script type="text/javascript" defer="defer">
-<!--
-function go(formObj) {
-	if (formObj.chooser.options[formObj.chooser.selectedIndex].value != "none") {
-		location = formObj.chooser.options[formObj.chooser.selectedIndex].value;
-	}
-}
-//-->
-</script>
-
-<form action="#">
-<tmpl_if session.var.adminOn><tmpl_var controls></tmpl_if>
-<p style="margin:0px;">
-<select name="chooser" size="1" onchange="go(this.form)">
-<option value="none">Where do you want to go?</option>
-<tmpl_loop page_loop>
-	<option value="<tmpl_var page.url>"><tmpl_loop page.indent_loop>&nbsp;&nbsp;</tmpl_loop>- <tmpl_var page.menuTitle></option>
-</tmpl_loop>
-</select>
-</p>
-</form>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_dtree.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_dtree.tmpl
deleted file mode 100644
index 49121d945..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_dtree.tmpl
+++ /dev/null
@@ -1,39 +0,0 @@
-#PBtmpl0000000000000130
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<div class="dtree">
-<script type="text/javascript">
-<!--
-	// Path to dtree directory
-	_dtree_url = "^Extras(Navigation/dtree/);";
-
-	d = new dTree('d');
-	<tmpl_loop page_loop>
-	d.add(
-		'<tmpl_var page.assetId escape=JS>',
-		<tmpl_if __first__>-99<tmpl_else>'<tmpl_var page.parentId escape=JS>'</tmpl_if>,
-		'<tmpl_var page.menuTitle escape=JS>',
-		'<tmpl_var page.url escape=JS>',
-		'<tmpl_var page.synopsis escape=JS>'
-		<tmpl_if page.newWindow>,'_blank'</tmpl_if>
-	);
-	</tmpl_loop>
-	document.write(d);
-//-->
-</script>
-</div>
-~~~
-<link href="^Extras(Navigation/dtree/dtree.css);" type="text/css" rel="stylesheet" />
-<script src="^Extras(Navigation/dtree/dtree.js);" type="text/javascript"></script>
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_events_list.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_events_list.tmpl
deleted file mode 100644
index 926bfd36c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_events_list.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-#PBtmpl0000000000000086
-<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 session.var.adminOn>
-	<a href="<tmpl_var addevent.url>"><tmpl_var addevent.label></a>
-	<p />
-</tmpl_if>
-
-<tmpl_loop month_loop>
-	<tmpl_loop day_loop>
-		<tmpl_loop event_loop>
-			<tmpl_if isFirstDayOfEvent>
-			<div class="eventsList">
-				<tmpl_unless dateIsSameAsPrevious>
-					<b>
-						<tmpl_var start.day.dayOfWeek> <tmpl_var start.month> <tmpl_var start.day><tmpl_unless startEndYearMatch>, <tmpl_ start.year> -
-						<tmpl_var end.day.dayOfWeek> <tmpl_var end.month> <tmpl_var end.day></tmpl_unless><tmpl_unless startEndMonthMatch> - <tmpl_var end.day.dayOfWeek> <tmpl_var end.month> <tmpl_var end.day><tmpl_else><tmpl_unless startEndDayMatch> - <tmpl_var end.day></tmpl_unless></tmpl_unless>, <tmpl_var end.year>
-					</b>
-				</tmpl_unless>
-					&#160;&#160;&#160;
-					<tmpl_if session.var.adminOn>
-						<a href="<tmpl_var url>">
-					</tmpl_if>
-					<i><tmpl_var name></i>
-					<tmpl_if session.var.adminOn>
-						</a>
-					</tmpl_if>
-					<tmpl_if description>
-						- <tmpl_var description>
-					</tmpl_if description>
-				</div>
-			</tmpl_if>
-		</tmpl_loop>
-	</tmpl_loop>
-	<p />
-</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>
-
-
-~~~
-<style type="text/css">
-.pagination	{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:100%;
-	text-align:center;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-.pagination a {
-	color:white;
-}
-.fontSettings {
-	font-family:arial;
-	font-size:9pt;
-}
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}	
-.eventsList {
-	font-family:arial;
-	font-size:9pt;		
-}
-.eventsList a {
-	color:#29587E;
-}
-.eventsList b {
-	margin-top:7px;
-	margin-bottom:1px;
-	display:block;
-}
-
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_fail_safe.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_fail_safe.tmpl
deleted file mode 100644
index d3d6a4f51..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_fail_safe.tmpl
+++ /dev/null
@@ -1,59 +0,0 @@
-#PBtmpl0000000000000060
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>^Page("title"); - WebGUI</title>
-	<tmpl_var head.tags>
-</head>
-<body>
-	^AdminBar;
-	<div class="topwrapper">
-
-	<div class="menu">
-		^AssetProxy(flexmenu);
-	</div>
-
-	<div class="contentArea">
-		<tmpl_var body.content>
-		<br />
-		<br />
-		<hr />
-		^LoginToggle; &nbsp; ^a(^@;); &nbsp; ^H; &nbsp; ^AdminToggle;
-	</div>
-
-	</div>
-
-</body>
-</html>
-~~~
-<style type="text/css">
-
-div.topwrapper {
-	position: relative;
-}
-
-.menu {
-	position: absolute;
-	top: 25px;
-	left: 10px;
-	width: 180px;
-	font-family: helvetica, arial;
-	font-size: 12px;
-}
-
-.contentArea {
-	border: 1px solid #cccccc;
-	margin: 25px 10px 10px 190px;
-	padding: 5px;
-	font-family: helvetica, arial;
-	min-height: 400px;
-}
-
-/* Hides from non-ie: the holly hack \*/
-* html .adminConsoleWorkArea {
-	zoom: 1.00;
-	display: inline;
-}
-/* End hide from non-ie */
-
-	</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_faq.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_faq.tmpl
deleted file mode 100755
index 94f0aabd5..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_faq.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-#PBtmpl0000000000000080
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
-	</tmpl_if>
-</p>
-
-<ul>
-	<tmpl_loop post_loop>
-	   <li><a href="#id<tmpl_var assetId>"><span class="faqQuestion"><tmpl_var title></span></a></li>
-	</tmpl_loop>
-</ul>
-
-<tmpl_loop post_loop>
-	<tmpl_if user.isPoster>
-		<tmpl_unless session.var.adminOn>
-			<div>[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]</div>
-		</tmpl_unless>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<div>
-			<tmpl_if session.var.adminOn>
-				<tmpl_var controls>
-			<tmpl_else>
-				<tmpl_unless user.isPoster>
-					<tmpl_unless session.var.adminOn>
-						[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-					</tmpl_unless>
-				</tmpl_unless>
-			</tmpl_if>
-			(<a href="<tmpl_var url>"><tmpl_var status></a>)
-		</div>
-	</tmpl_if>
-	<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a><span class="faqQuestion"><tmpl_var title></span><br />
-	<tmpl_var content>
-	<p><a href="#top">[top]</a></p>
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage>  &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_faq_submission_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_faq_submission_form.tmpl
deleted file mode 100644
index 9843e541d..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_faq_submission_form.tmpl
+++ /dev/null
@@ -1,92 +0,0 @@
-#PBtmpl0000000000000099
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
-<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
-
-<tmpl_if isReply>
-	<h2><tmpl_var message.header.label></h2>
-<tmpl_else>
-	<h2><tmpl_var question.header.label></h2>
-</tmpl_if>
-
-<tmpl_var form.header>
-<table class="faqSubmissionForm">
-	<tmpl_if isReply>
-		<tr>
-			<td><tmpl_var subject.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var message.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-	<tmpl_else>
-		<tr>
-			<td><tmpl_var question.label></td>
-			<td><tmpl_var title.form.textarea></td>
-		</tr>
-		<tr>
-			<td><tmpl_var answer.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-		<tmpl_if attachment.form>
-			<tr>
-				<td><tmpl_var attachment.label></td>
-				<td><tmpl_var attachment.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<div class="faqSubmissionFormContent">
-		<b><tmpl_var reply.title></b><br /><br />
-		<tmpl_var reply.content>
-	</div>
-</tmpl_if>
-
-
-~~~
-<style type="text/css">
-table.faqSubmissionForm td
-{
-	font-family:arial;
-	font-size:9pt;
-}
-.faqSubmissionFormContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-h2
-{
-	font-family:arial;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_file.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_file.tmpl
deleted file mode 100644
index a2e0c28df..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_file.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#PBtmpl0000000000000024
-<tmpl_if session.var.adminOn><tmpl_if controls><p><tmpl_var controls></p></tmpl_if></tmpl_if><a href="<tmpl_var fileUrl>"><img src="<tmpl_var fileIcon>" alt="<tmpl_var title>" style="border-style:none;" /><tmpl_var filename></a>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_file_folder.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_file_folder.tmpl
deleted file mode 100644
index 00a217ea4..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_file_folder.tmpl
+++ /dev/null
@@ -1,48 +0,0 @@
-#PBtmpl0000000000000078
-<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> </tmpl_if>
-			
-<tmpl_if session.var.adminOn> <p><a href="<tmpl_var addFile.url>"><tmpl_var addFile.label></a></p> </tmpl_if>
-				
-<table width="100%" cellpadding="3" cellspacing="0" class="content"> 
-<tmpl_loop subfolder_loop> 
-
- <tr>
- <td class="tableData" valign="top">
-<tmpl_if canView>
-	<a href="<tmpl_var url>"><img src="<tmpl_var icon.small>" border="0" alt="<tmpl_var title>" /></a>
-	<a href="<tmpl_var url>"><tmpl_var title></a>
-<tmpl_else>
-	<img src="<tmpl_var icon.small>" border="0" alt="<tmpl_var title>" /><tmpl_var title>
-</tmpl_if>
- </td>
- <td class="tableData" valign="top" colspan="3">
- <tmpl_var synopsis>
- </td>
- </tr>
-</tmpl_loop>
-				    								
-<tmpl_loop file_loop>
- <tr>
- <td valign="top" class="tableData">
- <tmpl_if session.var.adminOn>
-  <tmpl_if canEdit>
-   <tmpl_var controls>
-  </tmpl_if>
- </tmpl_if>
-<tmpl_if canView>
- <a href="<tmpl_if isFile><tmpl_var file.url><tmpl_else><tmpl_var url></tmpl_if>"><img src="<tmpl_var icon.small>" border="0" alt="<tmpl_var title>" /></a>
- <a href="<tmpl_if isFile><tmpl_var file.url><tmpl_else><tmpl_var url></tmpl_if>"><tmpl_var title></a>
-<tmpl_else>
- <img src="<tmpl_var icon.small>" border="0" alt="<tmpl_var title>" /><tmpl_var title>
-</tmpl_if>
-</td> <td class="tableData" valign="top">
- <tmpl_var synopsis></td><td class="tableData" valign="top">^D("%z %Z",<tmpl_var date.epoch>);</td>
- <td class="tableData" valign="top"><tmpl_var size></td></tr>
-</tmpl_loop>
-</table>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_file_with_size.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_file_with_size.tmpl
deleted file mode 100644
index 7aefeb6aa..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_file_with_size.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#PBtmpl0000000000000107
-<a href="<tmpl_var file.url>"><img src="<tmpl_var file.icon>" alt="<tmpl_var file.icon>" style="border-style:none;vertical-align:middle;" /><tmpl_var file.name></a>(<tmpl_var file.size>)
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_google_do_google_search.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_google_do_google_search.tmpl
deleted file mode 100644
index b17840cc5..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_google_do_google_search.tmpl
+++ /dev/null
@@ -1,57 +0,0 @@
-#PBtmpl0000000000000100
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<tmpl_if description>
-	<tmpl_var description><br /><br />
-</tmpl_if>
-
-<form method="post">
-	<input type="hidden" name="func" value="view" />
-	<input type="hidden" name="wid" value="<tmpl_var wobjectId>" />
-	<input type="hidden" name="targetWobjects" value="doGoogleSearch" />
-	<input type="text" name="q"><input type="submit" value="Search" />
-</form>
-
-<tmpl_if results>
-	<tmpl_loop results>
-		<tmpl_if resultElements>
-			<p>You searched for <b><tmpl_var searchQuery></b>. We found around <tmpl_var estimatedTotalResultsCount> matching records.</p>
-		</tmpl_if>
-
-		<tmpl_loop resultElements>
-			<a href="<tmpl_var URL>">
-			<tmpl_if title>
-				<tmpl_var title>
-			<tmpl_else>
-				<tmpl_var url>
-			</tmpl_if>
-			</a><br />
-			<tmpl_if snippet>
-				<tmpl_var snippet><br />
-			</tmpl_if>
-			<div class="googleDetail">
-			<tmpl_if summary>
-				<b>Description:</b> <tmpl_var summary><br />
-			</tmpl_if>
-			<a href="<tmpl_var URL>"><tmpl_var URL></a>
-			<tmpl_if cachedSize>
-				- <tmpl_var cachedSize>
-			</tmpl_if>
-			</div><br />
-		</tmpl_loop>
-	</tmpl_loop>
-<tmpl_else>
-	Could not retrieve results from Google.
-</tmpl_if>
-~~~
-<style type="text/css">
-.googleDetail {
-	font-size: 9px;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_guest_book.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_guest_book.tmpl
deleted file mode 100755
index 19bb9f823..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_guest_book.tmpl
+++ /dev/null
@@ -1,45 +0,0 @@
-#PBtmpl0000000000000133
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
-	</tmpl_if>
-</p>
-
-<tmpl_loop post_loop>
-
-<div><b>On <tmpl_var dateSubmitted.human> <a href="<tmpl_var userProfile.url>"><tmpl_var username></a> from <a href="<tmpl_var url>">the '<tmpl_var title>' department</a> wrote</b></div>
-<div><i><tmpl_var synopsis></i></div>
-<div><a href="<tmpl_var url>"><tmpl_var readmore.label></a></div>
-<p />
-
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_horizontal_login_box.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_horizontal_login_box.tmpl
deleted file mode 100644
index e815bb342..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_horizontal_login_box.tmpl
+++ /dev/null
@@ -1,27 +0,0 @@
-#PBtmpl0000000000000092
-<div class="loginBox">
-<tmpl_if user.isVisitor>
-	<tmpl_var form.header>
-	<table border="0" cellpadding="1" cellspacing="0">
-	<tr>
-		<td><tmpl_var username.form></td>
-		<td><tmpl_var password.form></td>
-		<td><tmpl_var form.login></td>
-	</tr>
-	<tr>
-		<td><tmpl_var username.label></td>
-		<td><tmpl_var password.label></td>
-		<td></td>
-	</tr>
-	</table>             	<tmpl_if session.setting.anonymousRegistration>
-                        <a href="<tmpl_var account.create.url>"><tmpl_var account.create.label></a>
-	</tmpl_if>		<tmpl_var form.footer> 
-<tmpl_else>
-	<tmpl_unless customText>
-		<tmpl_var hello.label> <a href="<tmpl_var account.display.url>"><tmpl_var session.user.username></a>.
-                          <a href="<tmpl_var logout.url>"><tmpl_var logout.label></a>
-	<tmpl_else>
-		<br /><tmpl_var customText>
-	</tmpl_unless>
-</tmpl_if>
-</div>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_horizontalmenu.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_horizontalmenu.tmpl
deleted file mode 100644
index d0edca9ff..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_horizontalmenu.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
-#PBtmpl0000000000000108
-		<tmpl_if displayTitle>
-		<h2><tmpl_var title></h2>
-		</tmpl_if>
-		<tmpl_if description>
-			<p><tmpl_var description></p>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-<tmpl_var controls>
-</tmpl_if>
-<span class="horizontalMenu">
-<tmpl_loop page_loop>
-<a class="horizontalMenu" <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
-   <tmpl_unless "__last__"> &middot; </tmpl_unless>
-</tmpl_loop>
-</span>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_image.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_image.tmpl
deleted file mode 100644
index 51cea0ba7..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_image.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#PBtmpl0000000000000088
-<tmpl_if session.var.adminOn><tmpl_if controls><p><tmpl_var controls></p></tmpl_if></tmpl_if><img src="<tmpl_var fileUrl>" <tmpl_var parameters> />
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_indentnav.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_indentnav.tmpl
deleted file mode 100644
index fc889b046..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_indentnav.tmpl
+++ /dev/null
@@ -1,58 +0,0 @@
-#PBnav00000000indentnav
-#title:Indent Nav
-#menuTitle:Indent Nav
-#url:indent_nav
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>			
-		
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-		
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>		
-		
-<div class="mainNav">
-	<tmpl_loop page_loop>	
-		<div class="level<tmpl_var page.relDepth>">
-			<a <tmpl_if page.isCurrent> class="navOn"</tmpl_if><tmpl_if page.isAncestor> class="anAncestor" </tmpl_if><tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
-		</div>		
-	</tmpl_loop>
-</div>
-~~~
-<style type="text/css">
-.mainNav {
-
-}
-.mainNav a {
-	
-}
-a.navOn {
-	
-}
-a.anAncestor {
-
-}
-div.level0 a {
-	margin-left:0px;
-	display:block;
-}
-div.level1 a {
-	margin-left:15px;
-	display:block;	
-}
-div.level2 a {
-	margin-left:30px;
-	display:block;
-}
-div.level3 a {
-	margin-left:45px;
-	display:block;
-}
-div.level4 a {
-	margin-left:60px;
-	display:block;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_iob_report_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_iob_report_template.tmpl
deleted file mode 100644
index 619d81774..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_iob_report_template.tmpl
+++ /dev/null
@@ -1,68 +0,0 @@
-#IOB0000000000000000002
-
-<h2>In/Out Board Report</h2>
-<div class="iob">
-   <tmpl_var form><br />
-   <tmpl_if showReport>
-   <table width="100%" cellpadding="3" cellspacing="0">
-   <tr>
-   <th><tmpl_var username.label></th>
-   <th><tmpl_var status.label></th>
-   <th><tmpl_var date.label></th>
-   <th><tmpl_var message.label></th>
-   <th><tmpl_var updatedBy.label></th>
-   </tr>
-   <tmpl_loop rows_loop>
-   <tmpl_if deptHasChanged>
-   <tr><td colspan="5"><b><tmpl_var department></b></td></tr>
-   </tmpl_if>
-   <tr>
-   <td><tmpl_var username></td>
-   <td><tmpl_var status></td>
-   <td><tmpl_var dateStamp></td>
-   <td><tmpl_var message></td>
-   <td><tmpl_var createdBy></td>
-   </tr>
-   </tmpl_loop>
-   <tr><td colspan="5"><tmpl_var paginateBar></td></tr>
-   </table>
-   </tmpl_if>
-</div>
-
-
-~~~
-<style type="text/css">
-.fontSettings {
-	font-family:arial;
-	font-size:9pt;
-}
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.iob td {	
-	font-family:arial;
-	font-size:9pt;	
-	border:solid silver 1px;
-}
-.iob a {
-	color:#29587E;
-}
-.iob .formDescription {
-	background-color:#DADADA;
-}
-.pagination	{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:100%;
-	text-align:center;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-.pagination a {
-	color:white;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_iob_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_iob_template.tmpl
deleted file mode 100644
index 9b8c8d68d..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_iob_template.tmpl
+++ /dev/null
@@ -1,92 +0,0 @@
-#IOB0000000000000000001
-<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> 
-
-<div class="fontSettings">
-	<tmpl_var description>
-	<br /><br />
-</div>
-
-<div class="pagination">
-<tmpl_if selectDelegatesURL>
-   <a href="<tmpl_var selectDelegatesURL>">Select delegates</a>
-</tmpl_if>
-<tmpl_if canViewReport>
-   <tmpl_if selectDelegatesURL>
-      &nbsp;&middot;&nbsp;
-   </tmpl_if>
-   <a href="<tmpl_var viewReportURL>">View Report</a>
-</tmpl_if>
-</div>
-
-<tmpl_if displayForm>	
-	<div class="fontSettings">
-		<tmpl_var form>
-	</div>	
-</tmpl_if>
-   
-   <table width="100%" cellpadding="3" cellspacing="0" class="iob">
-   <tmpl_loop rows_loop>
-   <tmpl_if deptHasChanged>
-   <tr><td colspan="4" class="noBorder"><br /><b><tmpl_var department></b></td></tr>
-   </tmpl_if>
-   <tr>
-   <td<tmpl_if __ODD__> class="odd"</tmpl_if>><tmpl_var username></td>
-   <td<tmpl_if __ODD__> class="odd"</tmpl_if>><tmpl_var status></td>
-   <td<tmpl_if __ODD__> class="odd"</tmpl_if>><tmpl_var dateStamp></td>
-   <td<tmpl_if __ODD__> class="odd"</tmpl_if>><tmpl_var message></td>
-   </tr>
-   </tmpl_loop>
-   <tr><td colspan="4"><tmpl_var paginateBar></td></tr>
-   </table>
-   
-   
-~~~
-<style type="text/css">
-.fontSettings {
-	font-family:arial;
-	font-size:9pt;
-}
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.iob {
-			
-}	
-.iob td {	
-	font-family:arial;
-	font-size:9pt;	
-	border:solid silver 1px;
-}
-.iob td.odd {
-	background-color:#DADADA;
-}
-.iob td.noBorder {
-	border:none;
-}	
-.iob a {
-	color:#29587E;
-}
-.pagination	{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:100%;
-	text-align:center;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-.pagination a {
-	color:white;
-}   
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_item.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_item.tmpl
deleted file mode 100755
index 6464a3ddc..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_item.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-#PBtmpl0000000000000123
-<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>
-	<tmpl_if linkurl><a href="<tmpl_var linkurl>"></tmpl_if><span class="itemTitle"><tmpl_var title></span><tmpl_if linkurl></a></tmpl_if>
-</tmpl_if>
-
-<tmpl_if attachment.name>
-	<tmpl_if displaytitle> - </tmpl_if>
-	<p style="display:inline;vertical-align:middle;"><a href="<tmpl_var attachment.url>"><img src="<tmpl_var attachment.icon>" style="vertical-align:middle;border: 0px;" alt="<tmpl_var attachment.name>" /></a></p>
-</tmpl_if>
-
-<tmpl_if description>
-  - <tmpl_var description>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_item_with_pop_up_links.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_item_with_pop_up_links.tmpl
deleted file mode 100755
index 8b64407b0..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_item_with_pop_up_links.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-#PBtmpl0000000000000129
-<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>
-	<tmpl_if linkurl><a href="#" onclick="window.open('<tmpl_var linkurl>');"></tmpl_if><span class="itemTitle"><tmpl_var title></span><tmpl_if linkurl></a></tmpl_if>
-</tmpl_if>
-
-<tmpl_if attachment.name>
-	<tmpl_if displaytitle> - </tmpl_if>
-	<p style="display:inline;vertical-align:middle;"><a href="<tmpl_var attachment.url>"><img src="<tmpl_var attachment.icon>" style="vertical-align:middle;border: 0px;" alt="<tmpl_var attachment.name>" /></a></p>
-</tmpl_if>
-
-<tmpl_if description>
-  - <tmpl_var description>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_job.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_job.tmpl
deleted file mode 100644
index 23d093070..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_job.tmpl
+++ /dev/null
@@ -1,326 +0,0 @@
-#PBtmpl0000000000000098
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<tmpl_if user.isModerator>
-	<div style="float: right; font-size: 11px; border: 1px solid #cccccc; padding: 2px; margin: 2px;">
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	</div>
-</tmpl_if>	
-
-<tmpl_if content>
-	<b>Job Description</b><br />
-	<p><tmpl_var content></p>
-</tmpl_if>
-
-<tmpl_if userDefined3>
-	<b>Job Requirements</b><br />
-	<p><tmpl_var userDefined3></p>
-</tmpl_if>
-
-<table width="100%">
-<tr>
-	<td class="tableHeader">Date Posted</td>
-	<td class="tableData"><tmpl_var dateSubmitted.human>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Location</td>
-	<td class="tableData"><tmpl_var userDefined2>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Compensation</td>
-	<td class="tableData"><tmpl_var userDefined1>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Views</td>
-	<td class="tableData"><tmpl_var views>&#160;</td>
-</tr>
-</table>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<tmpl_if repliesAllowed>
-
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<div style="float: left; width: 50%">
-							<b><tmpl_var user.label>:</b> 
-								<tmpl_if user.isVisitor>
-									<tmpl_var username>
-								<tmpl_else>
-									<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-								</tmpl_if>
-								<br />
-							<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-						</div>	
-						<div>
-							<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-							<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<tmpl_if user.isPoster>
-									<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-								</tmpl_if>	
-						</div>	
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-							<div style="float: left; width: 50%">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-							</div>	
-							<div>
-								<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-									<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-									</tmpl_unless>
-									<br />
-									<tmpl_if user.isPoster>
-										<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-									</tmpl_if>	
-							</div>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>			
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-
-
-~~~
-<style type="text/css">
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-	font-size:9pt;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.postControls
-{
-	background:#C0C0C0;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-.postControls a
-{
-	color:white;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.threadData {
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-
-.tableHeader
-{
-	width:20%;
-	background-color:#DADADA;
-	font-family:arial;
-	font-size:9pt;	
-}
-
-.tableData
-{
-	width:80%;
-	border:solid #DADADA 1px;
-	font-family:arial;
-	font-size:9pt;	
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_job_listing.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_job_listing.tmpl
deleted file mode 100755
index d06f31c5c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_job_listing.tmpl
+++ /dev/null
@@ -1,86 +0,0 @@
-#PBtmpl0000000000000077
-<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>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&#149;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&#149;
-	</tmpl_unless>
-	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-</p>
-
-<table width="100%">
-<tr>
-	<tmpl_if user.isModerator>
-		<td class="forumHead"><tmpl_var status.label></td>
-	</tmpl_if>
-	<td class="forumHead"><tmpl_var job.title.label></td>
-	<td class="forumHead"><tmpl_var location.label></td>
-	<td class="forumHead"><tmpl_var compensation.label></td>
-	<td class="forumHead"><tmpl_var date.label></td>
-</tr>
-
-<tmpl_loop post_loop>
-<tr>
-	<tmpl_if user.isModerator>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var status></td>
-	</tmpl_if>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a><tmpl_if user.isPoster> (<tmpl_var status>)</tmpl_if></td>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var userDefined2></td>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var userDefined1></td>
-	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateSubmitted.human></td>
-</tr>
-</tmpl_loop>
-</table>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-
-.forumHead {
-	background-color: #eeeeee;
-	border-bottom: 1px solid #cccccc;
-	padding: 2px;
-	padding-bottom: 4px;
-	font-size: 13px;
-	font-weight: bold;
-}
-
-.oddThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #83cc83;
-	padding-bottom: 4px;
-}
-
-.evenThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #aaaaff;
-	padding-bottom: 4px;
-}
-</style>
-
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_job_submission_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_job_submission_form.tmpl
deleted file mode 100644
index e94b090f5..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_job_submission_form.tmpl
+++ /dev/null
@@ -1,125 +0,0 @@
-#PBtmpl0000000000000122
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<div class="jobSubmissionFormContent">
-	<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
-	<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
-	<tmpl_if preview.userDefined3><p><tmpl_var preview.userDefined3></p></tmpl_if>
-	<tmpl_if preview.userDefined1><p><tmpl_var preview.userDefined1></p></tmpl_if>
-	<tmpl_if preview.userDefined2><p><tmpl_var preview.userDefined2></p></tmpl_if>
-</div>
-
-<tmpl_if isReply>
-	<h2><tmpl_var message.header.label></h2>
-<tmpl_else>
-	<h2><tmpl_var job.header.label></h2>
-</tmpl_if>
-
-<tmpl_var form.header>
-<table class="jobSubmissionFormContent">
-	<tmpl_if isReply>
-		<tr>
-			<td><tmpl_var subject.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var message.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-	<tmpl_else>
-		<tr>
-			<td><tmpl_var job.title.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var synopsis.label></td>
-			<td><tmpl_var synopsis.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var job.description.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var job.requirements.label></td>
-			<td><tmpl_var userDefined3.form.htmlarea></td>
-		</tr>
-		<tr>
-			<td><tmpl_var compensation.label></td>
-			<td><tmpl_var userDefined1.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var location.label></td>
-			<td><tmpl_var userDefined2.form></td>
-		</tr>
-		<tmpl_if attachment.form>
-			<tr>
-				<td><tmpl_var attachment.label></td>
-				<td><tmpl_var attachment.form></td>
-			</tr>
-		</tmpl_if>
-		<tr>
-			<td><tmpl_var startDate.label></td>
-			<td><tmpl_var startDate.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var endDate.label></td>
-			<td><tmpl_var endDate.form></td>
-		</tr>
-	</tmpl_if>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<div class="jobSubmissionFormContent">
-		<b><tmpl_var reply.title></b><br /><br />
-		<tmpl_var reply.content>
-		<tmpl_if reply.userDefined3><p><tmpl_var reply.userDefined3></p></tmpl_if>
-		<tmpl_if reply.userDefined1><p><tmpl_var reply.userDefined1></p></tmpl_if>
-		<tmpl_if reply.userDefined2><p><tmpl_var reply.userDefined2></p></tmpl_if>
-	</div>
-</tmpl_if>
-<p /><p />
-
-
-~~~
-<style type="text/css">
-table.jobSubmissionForm td
-{
-	font-family:arial;
-	font-size:9pt;
-}
-.jobSubmissionFormContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-h2
-{
-	font-family:arial;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_left_align_image.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_left_align_image.tmpl
deleted file mode 100755
index b50078206..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_left_align_image.tmpl
+++ /dev/null
@@ -1,57 +0,0 @@
-#PBtmpl0000000000000103
-<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 pagination.isFirstPage>
-<tmpl_if image.url>
-	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td class="content">
-	<img src="<tmpl_var image.url>" alt="<tmpl_var image.url>" align="left" border="0" />
-</tmpl_if>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-	<p />
-</tmpl_if>
-
-<tmpl_if pagination.isLastPage>
-<tmpl_if linkurl>
-	<tmpl_if linktitle>
-		<p />
-		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
-	</tmpl_if>
-</tmpl_if>
-
-	<tmpl_if attachment.name><p><p style="display:inline;vertical-align:middle;"><a href="<tmpl_var attachment.url>"><img src="<tmpl_var attachment.icon>" style="vertical-align:middle;border: 0px;" alt="<tmpl_var attachment.name>" /> <tmpl_var attachment.name></a></p></p></tmpl_if>
-</tmpl_if>
-
-<tmpl_if pagination.isFirstPage>
-<tmpl_if image.url>
-	</td></tr></table>
-</tmpl_if>
-</tmpl_if>
-
-<tmpl_if pagination.pageCount.isMultiple>
-<tmpl_var pagination.previousPage>
-&#183;
-<tmpl_var pagination.pageList.upTo20>
-&#183;
-<tmpl_var pagination.nextPage>
-</tmpl_if>
-
-<tmpl_if pagination.isLastPage>
-<tmpl_if allowDiscussion>
-	<p />
-	<table width="100%" cellspacing="2" cellpadding="1" border="0">
-	<tr><td align="center" style="width:50%;" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
-	<td align="center" style="width:50%;" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td></tr>
-	</table>
-</tmpl_if>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_left_column_collateral.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_left_column_collateral.tmpl
deleted file mode 100644
index 3e5e6aba3..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_left_column_collateral.tmpl
+++ /dev/null
@@ -1,100 +0,0 @@
-#PBtmpl0000000000000119
-<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>
-
-<table width="100%" class="productCollateral" border="0">
-<tr><td valign="top"  class="firstColumn">
-^Spacer(100,1);<br />
-<tmpl_if brochure.url>
-	<a href="<tmpl_var brochure.url>"><img src="<tmpl_var brochure.icon>" alt="<tmpl_var brochure.icon>" class="noBorder" align="absmiddle" /><tmpl_var brochure.label></a><br />
-</tmpl_if>
-<tmpl_if manual.url>
-	<a href="<tmpl_var manual.url>"><img src="<tmpl_var manual.icon>" alt="<tmpl_var manual.icon>" class="noBorder" align="absmiddle" /><tmpl_var manual.label></a><br />
-</tmpl_if>
-<tmpl_if warranty.url>
-	<a href="<tmpl_var warranty.url>"><img src="<tmpl_var warranty.icon>" alt="<tmpl_var warranty.icon>" class="noBorder" align="absmiddle" /><tmpl_var warranty.label></a><br />
-</tmpl_if>
-<br />
-<div class="centered">
-<tmpl_if thumbnail1>
-	<a href="<tmpl_var image1>"><img src="<tmpl_var thumbnail1>" alt="<tmpl_var thumbnail1>" class="noBorder" /></a><p />
-</tmpl_if>
-<tmpl_if thumbnail2>
-	<a href="<tmpl_var image2>"><img src="<tmpl_var thumbnail2>" alt="<tmpl_var thumbnail2>" class="noBorder" /></a><p />
-</tmpl_if>
-<tmpl_if thumbnail3>
-	<a href="<tmpl_var image3>"><img src="<tmpl_var thumbnail3>" alt="<tmpl_var thumbnail3>" class="noBorder" /></a><p />
-</tmpl_if>
-</div>
-</td><td valign="top" class="content">
-<tmpl_if description>
-<tmpl_var description><p />
-</tmpl_if>
-
-<b>Specs:</b><br/>
-<tmpl_if session.var.adminOn>
-	<a href="<tmpl_var addSpecification.url>"><tmpl_var addSpecification.label></a><p />
-</tmpl_if>
-<tmpl_loop specification_loop>
-	&middot;<tmpl_if session.var.adminOn><tmpl_var specification.controls></tmpl_if><b><tmpl_var specification.label>:</b> <tmpl_var specification.specification> <tmpl_var specification.units><br />
-</tmpl_loop>
-<p />
-
-<b>Features:</b><br/>
-<tmpl_if session.var.adminOn>
-	<a href="<tmpl_var addfeature.url>"><tmpl_var addfeature.label></a><p />
-</tmpl_if>
-<tmpl_loop feature_loop>
-	&middot;<tmpl_if session.var.adminOn><tmpl_var feature.controls></tmpl_if><tmpl_var feature.feature><br />
-</tmpl_loop>
-<p />
-
-<b>Options:</b><br />
-<tmpl_if session.var.adminOn>
-	<a href="<tmpl_var addaccessory.url>"><tmpl_var addaccessory.label></a><p />
-</tmpl_if>
-<tmpl_loop accessory_loop>
-	&middot;<tmpl_if session.var.adminOn><tmpl_var accessory.controls></tmpl_if><a href="<tmpl_var accessory.url>"><tmpl_var accessory.title></a><br />
-</tmpl_loop>
-
-</td></tr>
-</table>
-
-
-~~~
-<style type="text/css">
-.productCollateral {
-	border:solid gray 1px;
-}
-.productCollateral td {
-	font-size:9pt;
-	font-family:arial;
-}
-.productCollateral .firstColumn {
-	width:100px;
-	border:solid gray 1px;
-}
-.productCollateral .content {
-	width:100%;
-}
-.productCollateral .centered {
-	text-align:center;
-}
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.noBorder {
-	border:none;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_link.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_link.tmpl
deleted file mode 100644
index bff62b47f..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_link.tmpl
+++ /dev/null
@@ -1,313 +0,0 @@
-#PBtmpl0000000000000113
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<tmpl_if user.isModerator>
-	<div style="float: right; font-size: 11px; border: 1px solid #cccccc; padding: 2px; margin: 2px;">
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	</div>
-</tmpl_if>	
-
-<tmpl_if content>
-	<div class="linkContent">
-	<b>Link Description</b><br /><br />
-	<tmpl_var content><br />
-	
-	<b>Link URL</b><br /><br />
-	<a href="<tmpl_var userDefined1>"><tmpl_var userDefined1></a><br /><br />
-	</div>
-</tmpl_if>
-
-
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<tmpl_if repliesAllowed>
-
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<div style="float: left; width: 50%">
-							<b><tmpl_var user.label>:</b> 
-								<tmpl_if user.isVisitor>
-									<tmpl_var username>
-								<tmpl_else>
-									<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-								</tmpl_if>
-								<br />
-							<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-						</div>	
-						<div>
-							<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-							<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<tmpl_if user.isPoster>
-									<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-								</tmpl_if>	
-						</div>	
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>">[<tmpl_var reply.label>]</a>
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>">[<tmpl_var edit.label>]</a>
-								<a href="<tmpl_var delete.url>">[<tmpl_var delete.label>]</a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-							<div style="float: left; width: 50%">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-							</div>	
-							<div>
-								<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-									<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-									</tmpl_unless>
-									<br />
-									<tmpl_if user.isPoster>
-										<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-									</tmpl_if>	
-							</div>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>">[<tmpl_var reply.label>]</a>
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>">[<tmpl_var edit.label>]</a>
-									<a href="<tmpl_var delete.url>">[<tmpl_var delete.label>]</a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>">List All Links</a>
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		&bull;
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-
-
-~~~
-<style type="text/css">
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.postControls
-{
-	background:#C0C0C0;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-.postControls a
-{
-	color:white;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.threadData {
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-
-.linkContent
-{
-	height:100px;
-	font-family:arial;
-	font-size:9pt;
-}
-
-.linkContent a
-{
-	color:#29587E;
-}
-
-#mainText > .linkContent
-{
-	height:auto;
-	min-height:100px;
-}
-
-h2
-{
-	font-family:arial;
-}
-
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_link_list.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_link_list.tmpl
deleted file mode 100755
index f8d92ceaa..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_link_list.tmpl
+++ /dev/null
@@ -1,64 +0,0 @@
-#PBtmpl0000000000000083
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
-	</tmpl_if>
-</p>
-
-<tmpl_loop post_loop>
-	<tmpl_if user.isPoster>
-		<tmpl_unless session.var.adminOn>
-			<div>[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]</div>
-		</tmpl_unless>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<div>
-			<tmpl_if session.var.adminOn>
-				<tmpl_var controls>
-			<tmpl_else>
-				<tmpl_unless user.isPoster>
-					<tmpl_unless session.var.adminOn>
-						[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-					</tmpl_unless>
-				</tmpl_unless>
-			</tmpl_if>
-			(<a href="<tmpl_var url>"><tmpl_var status></a>)
-		</div>
-	</tmpl_if>
-	<p>
-		<tmpl_if userDefined1><a href="<tmpl_var userDefined1>"	<tmpl_if userDefined2>target="_blank"</tmpl_if>></tmpl_if><tmpl_var title><tmpl_if userDefined1></a></tmpl_if>
-		<tmpl_if content>
-				  - <tmpl_var content>
-		</tmpl_if>
-	</p>
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_link_list_submission_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_link_list_submission_form.tmpl
deleted file mode 100644
index eee267f50..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_link_list_submission_form.tmpl
+++ /dev/null
@@ -1,104 +0,0 @@
-#PBtmpl0000000000000114
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<div class="linkSubmissionFormContent">
-	<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
-	<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
-	<tmpl_if preview.userDefined1><p><a href="<tmpl_var preview.userDefined1>" <tmpl_if preview.userDefined2>target="_blank"</tmpl_if>><tmpl_var preview.userDefined1></a></p></tmpl_if>
-</div>
-
-<tmpl_if isReply>
-	<h2><tmpl_var message.header.label></h2>
-<tmpl_else>
-	<h2><tmpl_var link.header.label></h2>
-</tmpl_if>
-
-<tmpl_var form.header>
-<table class="linkSubmissionForm">
-	<tmpl_if isReply>
-		<tr>
-			<td><tmpl_var subject.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var message.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-	<tmpl_else>
-		<tr>
-			<td><tmpl_var title.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var url.label></td>
-			<td><tmpl_var userDefined1.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var newWindow.label></td>
-			<td><tmpl_var userDefined1.form.yesNo></td>
-		</tr>
-		<tr>
-			<td><tmpl_var description.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-		<tmpl_if attachment.form>
-			<tr>
-				<td><tmpl_var attachment.label></td>
-				<td><tmpl_var attachment.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<div class="linkSubmissionFormContent">
-		<b><tmpl_var reply.title></b><br /><br />
-		<tmpl_var reply.content>
-		<tmpl_if reply.userDefined1><p><a href="<tmpl_var reply.userDefined1>" <tmpl_if reply.userDefined2>target="_blank"</tmpl_if>><tmpl_var reply.userDefined1></a></p></tmpl_if>
-	</div>
-</tmpl_if>
-
-
-~~~
-<style type="text/css">
-table.linkSubmissionForm td
-{
-	font-family:arial;
-	font-size:9pt;
-}
-.linkSubmissionFormContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-h2
-{
-	font-family:arial;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_linked_image_with_caption.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_linked_image_with_caption.tmpl
deleted file mode 100755
index 1c26a712d..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_linked_image_with_caption.tmpl
+++ /dev/null
@@ -1,60 +0,0 @@
-#PBtmpl0000000000000115
-<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 pagination.isFirstPage>
-<tmpl_if image.url>
-	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td class="content">
-		<table align="right">
-		<tr><td align="center">
-			<tmpl_if linkUrl>
-				<a href="<tmpl_var linkUrl>">
-				<img src="<tmpl_var image.url>" alt="<tmpl_var image.url>" border="0" /><br /><tmpl_var linkTitle>
-				</a>
-			<tmpl_else>
-				<img src="<tmpl_var image.url>" alt="<tmpl_var image.url>" border="0" /><br /><tmpl_var linkTitle>
-			</tmpl_if>
-		</td></tr>
-		</table>
-</tmpl_if>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-	<p />
-</tmpl_if>
-
-<tmpl_if pagination.isLastPage>
-	<tmpl_if attachment.name><p><p style="display:inline;vertical-align:middle;"><a href="<tmpl_var attachment.url>"><img src="<tmpl_var attachment.icon>" style="vertical-align:middle;border: 0px;" alt="<tmpl_var attachment.name>" /> <tmpl_var attachment.name></a></p></p></tmpl_if>
-</tmpl_if>
-
-<tmpl_if pagination.isFirstPage>
-<tmpl_if image.url>
-	</td></tr></table>
-</tmpl_if>
-</tmpl_if>
-
-<tmpl_if pagination.pageCount.isMultiple>
-<tmpl_var pagination.previousPage>
-&#183;
-<tmpl_var pagination.pageList.upTo20>
-&#183;
-<tmpl_var pagination.nextPage>
-</tmpl_if>
-
-<tmpl_if pagination.isLastPage>
-<tmpl_if allowDiscussion>
-	<p />
-	<table width="100%" cellspacing="2" cellpadding="1" border="0">
-	<tr><td align="center" style="width:50%;" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
-	<td align="center" style="width:50%;" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td></tr>
-	</table>
-</tmpl_if>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_mail_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_mail_form.tmpl
deleted file mode 100644
index 34f55582b..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_mail_form.tmpl
+++ /dev/null
@@ -1,95 +0,0 @@
-#PBtmpl0000000000000020
-<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 error_loop>
-<ul class="fontSettings">
-<tmpl_loop error_loop>
-	<li><b><tmpl_var error.message></b>
-</tmpl_loop>
-</ul>
-</tmpl_if>
-
-<tmpl_if description>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<tmpl_if canEdit>
-	<div class="dataControls">
-		<a href="<tmpl_var entryList.url>"><tmpl_var entryList.label></a>
-		&bull; <a href="<tmpl_var export.tab.url>"><tmpl_var export.tab.label></a>
-		<tmpl_if entryId>
-			&bull; <a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-			&bull; <a href="<tmpl_var addField.url>"><tmpl_var addField.label></a>
-			&bull; <a href="<tmpl_var addTab.url>"><tmpl_var addTab.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_if>
-
-<tmpl_var form.start>
-<table class="mailForm">
-<tmpl_loop field_loop>
-	<tmpl_unless field.isHidden>
-		<tr><td class="formDescription" valign="top">
-		<tmpl_if session.var.adminOn><tmpl_if canEdit><tmpl_var field.controls></tmpl_if></tmpl_if>
-		<tmpl_var field.label>
-		</td><td class="tableData" valign="top">
-		<tmpl_if field.isDisplayed>
-			<tmpl_var field.value>
-		<tmpl_else>
-			<tmpl_var field.form>
-		</tmpl_if>
-		<tmpl_if field.isRequired>*</tmpl_if>
-		<span class="formSubtext"><br /><tmpl_var field.subtext></span>
-		</td></tr>
-	</tmpl_unless>
-</tmpl_loop>
-<tr><td></td><td><tmpl_var form.send></td></tr>
-</table>
-
-<tmpl_var form.end>
-
-
-~~~
-<style type="text/css">
-h2{
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.fontSettings{
-	font-family:arial;
-	font-size:9pt;
-}
-.mailForm td{
-	font-family:arial;
-	font-size:9pt;
-}
-.dataControls
-{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-
-.dataControls a
-{
-	color:white;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_make_page_printable.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_make_page_printable.tmpl
deleted file mode 100644
index 23ab561d7..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_make_page_printable.tmpl
+++ /dev/null
@@ -1,106 +0,0 @@
-#PBtmpl0000000000000111
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-		<html>
-		<head>
-			<title>^Page(title); - <tmpl_var session.setting.companyName></title>
-				
-	<link rel="icon" href="^Extras(favicon.png);" type="image/png" />
-	<link rel="SHORTCUT ICON" href="^Extras(favicon.ico);" />
-	<tmpl_var head.tags>
-	
-		<style type="text/css">
-
-.content{
-  background-color: #ffffff;
-  color: #000000;
-  font-family: helvetica, arial;
-  font-size: 10pt;
-  padding: 10pt;
-}
-
-H1 {
-  font-family: helvetica, arial;
-  font-size: 16pt;
-}
-
-A {
-  color: #EF4200;
-}
-
-.pagination {
-  font-family: helvetica, arial;
-  font-size: 8pt;
-  text-align: center;
-}
-
-.formDescription {
-  font-family: helvetica, arial;
-  font-size: 10pt;
-  font-weight: bold;
-}
-
-.formSubtext {
-  font-family: helvetica, arial;
-  font-size: 8pt;
-}
-
-.highlight {
-  background-color: #dddddd;
-}
-
-.tableMenu {
-  background-color: #cccccc;
-  font-size: 8pt;
-  font-family: Helvetica, Arial;
-}
-
-.tableMenu a {
-  text-decoration: none;
-}
-
-.tableHeader {
-  background-color: #cccccc;
-  font-size: 10pt;
-  font-family: Helvetica, Arial;
-}
-
-.tableData {
-  font-size: 10pt;
-  font-family: Helvetica, Arial;
-}
-
-.pollAnswer {
-  font-family: Helvetica, Arial;
-  font-size: 8pt;
-}
-
-.pollColor {
-  background-color: #444444;
-}
-
-.pollQuestion {
-  font-face: Helvetica, Arial;
-  font-weight: bold;
-}
-
-.faqQuestion {
-  font-size: 12pt;
-  font-weight: bold;
-  color: #000000;
-}
-
-</style>
-		</head>
-		^AdminBar("");
-
-<body onload="window.print()">
-<div style="text-align:center;"><a href="^PageUrl;"><img src="^Extras(plainblack.gif);" style="border-style:none;" alt="" /></a></div>
-
-<div>
-			<tmpl_var body.content>
-</div>		
-
-<div style="text-align:center;">? 2001-2004 Plain Black LLC</div>
-</body>
-		</html>
-		
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_matrix_default_compare_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_matrix_default_compare_template.tmpl
deleted file mode 100644
index d7afbf731..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_matrix_default_compare_template.tmpl
+++ /dev/null
@@ -1,76 +0,0 @@
-#matrixtmpl000000000002
-<h2>Comparison</h2>
-<table cellpadding="0" cellspacing="0" border="0" style="font-size: 11px; font-family: helvetica, arial, sans-serif;">
-
-<tr>
-<td valign="top"><tmpl_var compare.form></td>
-<td style="width:10px;">&nbsp;</td>
-<td style="width:3px;background-color:silver;">&nbsp;</td>
-<td style="width:10px;">&nbsp;</td>
-<td valign="top">
-
-<tmpl_if isTooMany>
-You tried to compare too many listings. Please choose <tmpl_var maxCompares> or less at a time.
-</tmpl_if>
-
-<tmpl_if isTooFew>
-You must choose at least two products to compare. Less than two isn't much of a comparison.
-</tmpl_if>
-
-
-<tmpl_unless isTooFew><tmpl_unless isTooMany>
-
-
-<table style="font-size: 11px; font-family: helvetica, arial, sans-serif;" cellpadding="2" cellspacing="2" border="0">
-<tr>
-  <td style="border-bottom:solid gray 1px;font-weight:bold;font-size:13px;">Product</td>
-  <tmpl_loop product_loop>
-    <td style="border-bottom:solid gray 1px;"><a href="<tmpl_var url>"><tmpl_var name> <tmpl_var version></a></td>
-  </tmpl_loop>
-</tr>
-<tr>
-  <td class="lastUpdated">Last Updated</td>
-  <tmpl_loop lastupdated_loop>
-    <td class="lastUpdated" style="text-align:center;"><tmpl_var lastupdated></td>
-  </tmpl_loop>
-</tr>
-
-<tmpl_loop category_loop>
- <tr><td class="category"><b><tmpl_var category></b></td>
-  <tmpl_loop product_loop>
-    <td align="center"><tmpl_var name></td>
-  </tmpl_loop>
-
-
-</tr>
-  <tmpl_loop row_loop>
-  <tr
-   <tmpl_if __ODD__>
-      class="odd"
-   <tmpl_else>
-      class="even"
-   </tmpl_if>
-   >
-    <tmpl_loop column_loop>
-      <td class="<tmpl_var class>" <tmpl_if description>onmouseover="return escape('<tmpl_var description>')"</tmpl_if>>
-        <tmpl_var value>
-      </td>
-     </tmpl_loop>
-    </tr>
-   </tmpl_loop>
-  </tmpl_loop>
-</table>
-
-
-</tmpl_unless></tmpl_unless>
-
-</td></tr></table>
-~~~
-<style type="text/css">
-	.lastUpdated {
-		background-color:#F0F0F0;
-	}
-	.category {
-		font-size:13px;
-	}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_matrix_default_detailed_listing.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_matrix_default_detailed_listing.tmpl
deleted file mode 100644
index 60bd4a1df..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_matrix_default_detailed_listing.tmpl
+++ /dev/null
@@ -1,100 +0,0 @@
-#matrixtmpl000000000003
-
-<h2><tmpl_var productName></h2>
-
-
-<table class="content" border="0" cellspacing="5">
-<tr><td valign="top">
-		<table class="content">
-		<tr><td><b>Web Site</b></td><td><a onclick="window.open('<tmpl_var productUrl.click>')" href="#"><tmpl_var productUrl></a></td></tr>
-		<tr><td><b>Version Number</b></td><td><tmpl_var versionNumber></td></tr>
-		<tr><td><b>Manufacturer</b></td><td><a onclick="window.open('<tmpl_var manufacturerUrl.click>')" href="#"><tmpl_var manufacturerName></a></td></tr>
-		<tr><td><b>Last Updated</b></td><td><tmpl_var lastUpdated.date></td></tr>
-		<tr><td><b>Clicks</b></td><td><tmpl_var clicks></td></tr>
-		<tr><td><b>Views</b></td><td><tmpl_var views></td></tr>
-		<tr><td><b>Compares</b></td><td><tmpl_var compares></td></tr>
-		</table>
-	</td>
-	<td valign="top" style="background-color:silver;">&nbsp;</td>
-	<td valign="top">
-		<tmpl_if description>
-			<b>Description</b><br />
-			<tmpl_var description><br /><br />
-		</tmpl_if>
-
-		<b>Contact Maintainer</b><br />
-		<tmpl_if email.wasSent>
-			<div style="color: green;">Message sent.<br /></div>
-		</tmpl_if>
-		<tmpl_var email.form>
-	</td>
-	<td valign="top" style="background-color:silver;">&nbsp;</td>
-	<td valign="top">
-		<tmpl_var ratings>
-	</td>
-</tr>
-</table>
-
-<p />
-
-<table width="100%"  class="content">
-<tr>
-	<td valign="top" style="width:50%">
-		<span class="category">Features</span>
-		<table class="content" width="180">
-		<tmpl_if features>
-		<tmpl_loop features_loop>
-		<tr<tmpl_if __ODD__> class="odd"<tmpl_else> class="even"</tmpl_if>>
-			<td onmouseover="return escape('<tmpl_var description>')"><tmpl_var label></td>
-			<td><tmpl_var value></td>
-		</tr>
-		</tmpl_loop>
-		<tmpl_else>
-			<tr><td>&#160;</td></tr>
-		</tmpl_if>
-		</table>
-		
-		<p />
-	</td>
-	<td valign="top" style="width:50%;">
-		<span class="category">Benefits</span>
-		<table class="content" width="180">
-		<tmpl_if features>
-		<tmpl_loop benefits_loop>
-		<tr<tmpl_if __ODD__> class="odd"<tmpl_else> class="even"</tmpl_if>>
-			<td onmouseover="return escape('<tmpl_var description>')"><tmpl_var label></td>
-			<td class="<tmpl_var class>"><tmpl_var value></td>
-		</tr>
-		</tmpl_loop>
-		<tmpl_else>
-			<tr><td>&#160;</td></tr>
-		</tmpl_if>
-		</table>
-	</td>
-</tr>
-</table>
-
-<p />
-
-<tmpl_var discussion>
-
-<tmpl_if user.canEdit>
-  <br /> <hr /><a href="<tmpl_var edit.url>">Edit this listing.</a> <br />
-</tmpl_if>
-<tmpl_if user.canApprove>
- <tmpl_if isPending>
-   <a href="<tmpl_var approve.url>">Approve this listing.</a><br />
- </tmpl_if>
-   <a href="<tmpl_var delete.url>">Delete this listing.</a><br />
-  
-</tmpl_if>
-~~~
-<style type="text/css">
-.ratingForm {
- font-size: 9px;
-}
-.statBox {
-	width:100%;
-}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_matrix_default_view_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_matrix_default_view_template.tmpl
deleted file mode 100644
index d0a1b154d..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_matrix_default_view_template.tmpl
+++ /dev/null
@@ -1,182 +0,0 @@
-#matrixtmpl000000000001
-<tmpl_if session.var.adminOn>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-<h2><tmpl_var title></h2>
-
-<tmpl_if description>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<table width="100%" class="matrixDefault">
-<tr><td valign="top" class="leftColumn">
-<p>Use the form below to select up to <tmpl_var maxCompares> listings to compare at once.
-</p>
-
-<div>
-<tmpl_var compare.form>
-</div>
-
-</td><td valign="top">
-
-
-<p class="grayBox">
-<b>Narrow The Matrix</b><br />
-You can narrow the scope of the matrix by <a href="<tmpl_var search.url>">searching</a> for exactly the criteria you're looking for in a listing.
-</p>
-
-
-<p class="grayBox">
-<b>Expand The Matrix</b><br />
-<tmpl_if isLoggedIn>
-   <a href="<tmpl_var listing.add.url>">Click here to add a new listing.</a> Please note that you will be the official maintainer of the listing, and will be responsible for keeping it up to date.
-<tmpl_else>
-If you are the maker of a product, or are an expert user and are willing to maintain the listing, <a href="^a(linkonly);">create an account</a> so you can register your listing.
-</tmpl_if>
-
-</p>
-
-
-
-<br /><b>Listing Statistics</b><br />
-<table width="100%" border="0" class="stats">
-<tr>
-  <td class="columnOne">Most clicks:</td>
-  <td class="columnTwo"><tmpl_var best.clicks.count></td>
-  <td class="columnThree"><a href="<tmpl_var best.clicks.url>"><tmpl_var best.clicks.name></a></td>
-</tr>
-<tr>
-  <td>Most views:</td>
-  <td><tmpl_var best.views.count></td>
-  <td><a href="<tmpl_var best.views.url>"><tmpl_var best.views.name></a></td>
-</tr>
-<tr>
-  <td>Most compares:</td>
-  <td><tmpl_var best.compares.count></td>
-  <td><a href="<tmpl_var best.compares.url>"><tmpl_var best.compares.name></a></td>
-</tr>
-<tr>
-  <td>Most recently updated:</td>
-  <td><tmpl_var best.updated.date></td>
-  <td><a href="<tmpl_var best.updated.url>"><tmpl_var best.updated.name></a></td>
-</tr>
-<tr>
-  <td colspan="3" class="hrStyle">^Spacer(1,1);</td>
-</tr>
-<tr>
-  <td align="center" colspan="3">Best Rated By Users</td>
-</tr>
-<tmpl_loop best_rating_loop>
-<tr>
-  <td><tmpl_var category></td>
-  <td><tmpl_var mean>/10</td>
-  <td><a href="<tmpl_var url>"><tmpl_var name></a></td>
-</tr>
-</tmpl_loop>
-
-
-<tr>
-  <td colspan="3" class="hrStyle">^Spacer(1,1);</td>
-</tr>
-<tr>
-  <td colspan="3" align="center"><a href="<tmpl_var ratings.details.url>">View Ratings Details</a></td>
-</tr>
-<tr>
-  <td colspan="3" class="hrStyle">^Spacer(1,1);</td>
-</tr>
-
-
-<tr>
-  <td align="center" colspan="3">Worst Rated By Users</td>
-</tr>
-<tmpl_loop worst_rating_loop>
-<tr>
-  <td><tmpl_var category></td>
-  <td><tmpl_var mean>/10</td>
-  <td><a href="<tmpl_var url>"><tmpl_var name></a></td>
-</tr>
-</tmpl_loop>
-
-<tr>
-  <td colspan="3" class="hrStyle">^Spacer(1,1);</td>
-</tr>
-
-</table>
-
-<br />
-<br /><b>Site Statistics</b><br />
-<table class="content">
-<tr>
-  <td>Listing Count:</td>
-  <td><tmpl_var listing.count></td>
-</tr>
-<tr>
-  <td>Current Visitors:</td>
-  <td><tmpl_var current.user.count></td>
-</tr>
-<tr>
-  <td>Registered Users:</td>
-  <td><tmpl_var user.count></td>
-</tr>
-</table>
-
-
-
-
-<tmpl_if session.var.adminOn>
-<p>   <a href="<tmpl_var field.list.url>">List Fields</a> 
-</p>
-<tmpl_if pending_list>
-<b>PENDING LISTINGS:</b>
-</tmpl_if>
-<ul>
-<tmpl_loop pending_list>
-<li><a href="<tmpl_var url>"><tmpl_var productName></a></li>
-</tmpl_loop>
-</ul>
-</tmpl_if>
-
-</td></tr></table>
-~~~
-<style type="text/css">
-h2 {
-	font-family:arial;
-}
-.fontSettings {
-	font-size:9pt;
-	font-family:arial;
-}
-.matrixDefault {
-	
-}
-.matrixDefault td {
-	font-size:9pt;
-	font-family:arial;
-}
-.matrixDefault .leftColumn {
-	width:48%;
-}
-.matrixDefault .grayBox {
-	background-color:#DADADA;
-	padding:3px;
-	-moz-box-sizing:border-box;
-	border-bottom:solid gray 2px;
-}
-.matrixDefault .stats .columnOne{
-	width:30%;
-}
-.matrixDefault .stats .columnTwo{
-	width:20%;
-}
-.matrixDefault .stats .columnThree{
-	width:50%;
-}
-.hrStyle {
-	border-bottom:solid black 1px;
-	height:1px;
-	width:100%;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_matrix_rating_detail_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_matrix_rating_detail_template.tmpl
deleted file mode 100644
index db4f8014b..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_matrix_rating_detail_template.tmpl
+++ /dev/null
@@ -1,38 +0,0 @@
-#matrixtmpl000000000004
-<h2>Rating Detail</h2>
-
-<table class="content" cellpadding="5" width="60%">
-<tbody>
-<tmpl_loop rating_loop>
-<tmpl_if __ODD__>
-<tr>
-</tmpl_if>
-
-	<td style="width:50%" valign="top">
-	<h2><tmpl_var category></h2>
-
-	<table class="content">
-	<tbody>
-	<tr><th>Listing</th><th>Mean</th><th>Median</th><th>Count</th></tr>
-	<tmpl_loop detail_loop>
-
-	<tr>
-	<td><a href="<tmpl_var url>"><tmpl_var name></a></td>
-	<td><tmpl_var mean></td>
-	<td><tmpl_var median></td>
-	<td><tmpl_var count></td>
-	</tr>
-
-	</tmpl_loop>
-	</tbody>
-	</table>
-	</td>
-
-<tmpl_if __EVEN__>
-</tr>
-</tmpl_if>
-</tr>
-</tmpl_loop>
-
-</tbody>
-</table>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_matrix_search_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_matrix_search_template.tmpl
deleted file mode 100644
index 8f5bc11e2..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_matrix_search_template.tmpl
+++ /dev/null
@@ -1,101 +0,0 @@
-#matrixtmpl000000000005
-<h2>Search The Matrix</h2>
-
-<tmpl_if isTooFew>
-	<p class="fontSettings">Your search returned no results. Try specifying a few less criteria.</p>
-</tmpl_if>
-
-<tmpl_if isTooMany>
-<p class="fontSettings">
-	Your search returned too many results. Either select up to <tmpl_var maxCompares> products from the list below, or specify more critera.
-</p>
-</tmpl_if>
-
-
-<table width="100%" class="matrixSearch" border="0">
-<tr>
-	<td valign="top">
-		<tmpl_var compare.form>
-	</td>
-	<td valign="top">
-		<tmpl_var form.header>
-		<tmpl_var form.submit>
-		<table width="100%"  class="content">
-		<tr>
-			<td valign="top" style="width:50%;">
-				<span class="category">Features</span>
-				<table class="content" width="180">
-				<tmpl_if features>
-					<tmpl_loop features_loop>
-					<tr<tmpl_if __ODD__> class="odd"<tmpl_else> class="even"</tmpl_if>>
-						<td onmouseover="return escape('<tmpl_var description>')"><tmpl_var label></td>
-						<td><tmpl_var form></td>
-					</tr>
-					</tmpl_loop>
-				<tmpl_else>
-					<tr><td>&#160;</td></tr>
-				</tmpl_if>
-				</table>
-			</td>
-			<td valign="top" style="width:50%;">
-				<span class="category">Benefits</span>
-				<table class="content">
-				<tmpl_if features>
-					<tmpl_loop benefits_loop>
-					<tr<tmpl_if __ODD__> class="odd"<tmpl_else> class="even"</tmpl_if>>
-						<td onmouseover="return escape('<tmpl_var description>')"><tmpl_var label></td>
-						<td><tmpl_var form></td>
-					</tr>
-					</tmpl_loop>
-				<tmpl_else>
-					<tr><td>&#160;</td></tr>
-				</tmpl_if>
-				</table>
-			</td>
-		</tr>
-</table>
-
-<tmpl_var form.submit>
-</div>
-<tmpl_var form.footer>
-
-
-</td></tr></table>
-~~~
-<style type="text/css">
-h2 {
-	font-family:arial;
-}
-.fontSettings {
-	font-size:9pt;
-	font-family:arial;
-}
-.matrixSearch td {
-	font-size:9pt;
-	font-family:arial;
-}
-.matrixSearch .leftColumn {
-	width:48%;
-}
-.matrixSearch .grayBox {
-	background-color:#DADADA;
-	padding:3px;
-	-moz-box-sizing:border-box;
-	border-bottom:solid gray 2px;
-}
-.matrixSearch .stats .columnOne{
-	width:30%;
-}
-.matrixSearch .stats .columnTwo{
-	width:20%;
-}
-.matrixSearch .stats .columnThree{
-	width:50%;
-}
-.hrStyle {
-	border-bottom:solid black 1px;
-	height:1px;
-	width:100%;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_multisearch_default_display.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_multisearch_default_display.tmpl
deleted file mode 100644
index 01ee51d93..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_multisearch_default_display.tmpl
+++ /dev/null
@@ -1,57 +0,0 @@
-#MultiSearchTmpl0000001
-<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>
-<script type="text/javascript">
-function domultisearch() {
-var sf=document.getElementById("multisearchform");
-var submitto = sf.sengines.options[sf.sengines.selectedIndex].value + escape(sf.searchterms.value);
-window.open(submitto);
-return false;
-}
-</script>
-<div style="width:100%">
-<form id="multisearchform" onsubmit="return domultisearch();" action="">
-<table cellpadding="2" cellspacing="0" class="multiSearch" border="0">
-<tr>
-	<td align="right">Search:</td>
-	<td>
-		<select name="sengines">
-			<option value="http://www.google.com/search?q=" selected="selected">Google</option>
-			<option value="http://news.google.com/news?q=">Google News</option>
-			<option value="http://www.flickr.com/photos/tags/">Flickr Photos</option>
-			<option value="http://www.digg.com/search?submit=Submit&amp;search=">Digg.com</option>
-			<option value="http://www.altavista.com/web/results?q=">Alta Vista</option>
-			<option value="http://search.yahoo.com/search?p=">Yahoo!</option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td align="right">For:</td>
-	<td><input type="text" name="searchterms" />&#160;<input type="submit" name="SearchSubmit" value="Search" /></td>
-</tr>
-</table>
-</form>
-</div>
-~~~
-<style type="text/css">
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.multiSearch {
-	background-color:#DADADA;
-	border:solid gray 1px;	
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_news.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_news.tmpl
deleted file mode 100755
index 0f79ab731..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_news.tmpl
+++ /dev/null
@@ -1,144 +0,0 @@
-#PBtmpl0000000000000094
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<!-- begin position 1 -->
-<div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position1" class="content"><tbody>
-</tmpl_if>
-<tmpl_loop position1_loop>
-	<tmpl_if showAdmin>
-		<tr id="td<tmpl_var id>">
-		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-		</div></td>
-		</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-	</tbody></table>
-</tmpl_if>
-</div>
-
-<!-- end position 1 -->
-
-<div class="endFloat">&nbsp;</div>
-
-<!-- begin position 2 -->
-<div class="firstColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position2" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position2_loop>
-	<tmpl_if showAdmin>
-		<tr id="td<tmpl_var id>">
-		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-		</div></td>
-		</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-	</tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 2 -->
-
-<!-- begin position 3 -->
-<div class="firstColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position3" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position3_loop>
-	<tmpl_if showAdmin>
-		<tr id="td<tmpl_var id>">
-		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-		</div></td>
-		</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-	</tbody></table>
-</tmpl_if>
-</div> </div>
-<!-- end position 3 -->
-
-<div class="endFloat">&nbsp;</div>
-
-<!-- begin position 4 -->
-<div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position4" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position4_loop>
-	<tmpl_if showAdmin>
-		<tr id="td<tmpl_var id>">
-		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-		</div></td>
-		</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-	</tbody></table>
-</tmpl_if>
-</div>
-<!-- end position 4 -->
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-	<tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-	float: left;
-	width: 50%;
-}
-.secondColumn {
-	float: left;
-	width: auto;
-	max-width: 50%;
-}
-.endFloat {
-	clear: both;
-}
-</style>
-
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_ordered_list.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_ordered_list.tmpl
deleted file mode 100755
index 8d395cbf1..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_ordered_list.tmpl
+++ /dev/null
@@ -1,64 +0,0 @@
-#PBtmpl0000000000000101
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
-	</tmpl_if>
-</p>
-
-<ol>
-	<tmpl_loop post_loop>
-		<li>
-			<tmpl_if user.isPoster>
-				<tmpl_unless session.var.adminOn>
-					[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-				</tmpl_unless>
-			</tmpl_if>
-			<tmpl_if user.isModerator>
-				<tmpl_if session.var.adminOn>
-					<tmpl_var controls>
-				<tmpl_else>
-					<tmpl_unless user.isPoster>
-						<tmpl_unless session.var.adminOn>
-							[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-						</tmpl_unless>
-					</tmpl_unless>
-				</tmpl_if>
-				(<a href="<tmpl_var url>"><tmpl_var status></a>)
-			</tmpl_if>
-			<tmpl_if userDefined1><a href="<tmpl_var userDefined1>"	<tmpl_if userDefined2>target="_blank"</tmpl_if>></tmpl_if><tmpl_var title><tmpl_if userDefined1></a></tmpl_if>
-			<tmpl_if content>
-					  - <tmpl_var content>
-			</tmpl_if>
-		</li>
-	</tmpl_loop>
-</ol>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_photo_gallery.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_photo_gallery.tmpl
deleted file mode 100755
index 7107eda85..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_photo_gallery.tmpl
+++ /dev/null
@@ -1,68 +0,0 @@
-#PBtmpl0000000000000121
-<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>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&#149;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&#149;
-	</tmpl_unless>
-	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-</p>
-
-<br />
-
-<tmpl_loop post_loop>
-	<div class="picture">
-		<div style="text-align: center;">
-			<tmpl_if user.isPoster><div>(<tmpl_var status>)</div></tmpl_if>
-			<div><a href="<tmpl_var url>"><img src="<tmpl_var thumbnail>" alt="<tmpl_var title>" /></a></div>
-			<div><a href="<tmpl_var url>"><tmpl_var title></a></div>
-		</div>
-	</div>
-</tmpl_loop>
-
-<div style="clear: both;"></div>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-.picture {
-	padding: 0px;
-	margin: 10px;
-	float: left;
-	width: 150px;
-	font-size: 12px;
-	height: 100px;
-	overflow: hidden;
-}
-
-.picture img
-{
-	border: black solid 0px;
-}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_qa.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_qa.tmpl
deleted file mode 100644
index 564f17393..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_qa.tmpl
+++ /dev/null
@@ -1,101 +0,0 @@
-#PBtmpl0000000000000081
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p class="postControls">
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
-	</tmpl_if>
-</p>
-
-<tmpl_loop post_loop>
-	<tmpl_if user.isPoster>
-		<tmpl_unless session.var.adminOn>
-			<div>[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]</div>
-		</tmpl_unless>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<div>
-			<tmpl_if session.var.adminOn>
-				<tmpl_var controls>
-			<tmpl_else>
-				<tmpl_unless user.isPoster>
-					<tmpl_unless session.var.adminOn>
-						[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-					</tmpl_unless>
-				</tmpl_unless>
-			</tmpl_if>
-			(<a href="<tmpl_var url>"><tmpl_var status></a>)
-		</div>
-	</tmpl_if>
-	<p class="posts">
-		<b>Q: <tmpl_var title></b>
-		A: <tmpl_var content>
-	</p>
-	<p />
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-
-
-~~~
-<style type="text/css">
-.postControls
-{
-	background:#C0C0C0;
-	width:95%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-}
-
-.postControls a
-{
-	color:white;
-}
-
-.posts
-{
-	width:95%;
-	border:solid 1px gray;
-	padding:3px;
-	font-family:arial;
-}
-
-.posts b
-{
-	-moz-box-sizing:border-box;
-	background-color:silver;
-	width:100%;
-	display:block;
-	padding:3px;
-	margin-bottom:3px;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_randomthread_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_randomthread_template.tmpl
deleted file mode 100644
index 1988c2300..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_randomthread_template.tmpl
+++ /dev/null
@@ -1,92 +0,0 @@
-#WVtmpl0000000000000001
-<h2>RandomThread macro debug output:</h2>
-<dl>
-<dt>approve.url:</dt> <dd><tmpl_var approve.url></dd>
-<dt>assetId:</dt> <dd><tmpl_var assetId></dd>
-<dt>assetSize:</dt> <dd><tmpl_var assetSize></dd>
-
-<dt>&lt;tmpl_loop attachment_loop&gt;:</dt>
-<dd><tmpl_loop attachment_loop>
-<dt>filename:</dt> <dd><tmpl_var filename></dd>
-<dt>icon:</dt> <dd><tmpl_var icon></dd>
-<dt>isImage:</dt> <dd><tmpl_var isImage></dd>
-<dt>thumbnail:</dt> <dd><tmpl_var thumbnail></dd>
-<dt>url:</dt> <dd><tmpl_var url></dd>
-</tmpl_loop>&lt;/tmpl_loop&gt;
-</dd>
-
-<dt>attachment.icon:</dt> <dd><tmpl_var attachment.icon></dd>
-<dt>attachment.thumbnail:</dt> <dd><tmpl_var attachment.thumbnail></dd>
-<dt>attachment.url:</dt> <dd><tmpl_var attachment.url></dd>
-<dt>className:</dt> <dd><tmpl_var className></dd>
-<dt>content:</dt> <dd><tmpl_var content></dd>
-<dt>contentType:</dt> <dd><tmpl_var contentType></dd>
-<dt>createdBy:</dt> <dd><tmpl_var createdBy></dd>
-<dt>creationDate:</dt> <dd><tmpl_var creationDate></dd>
-<dt>dateSubmitted:</dt> <dd><tmpl_var dateSubmitted></dd>
-<dt>dateSubmitted.human:</dt> <dd><tmpl_var dateSubmitted.human></dd>
-<dt>dateUpdated:</dt> <dd><tmpl_var dateUpdated></dd>
-<dt>dateUpdated.human:</dt> <dd><tmpl_var dateUpdated.human></dd>
-<dt>delete.url:</dt> <dd><tmpl_var delete.url></dd>
-<dt>deny.url:</dt> <dd><tmpl_var deny.url></dd>
-<dt>edit.url:</dt> <dd><tmpl_var edit.url></dd>
-<dt>encryptPage:</dt> <dd><tmpl_var encryptPage></dd>
-<dt>endDate:</dt> <dd><tmpl_var endDate></dd>
-<dt>extraHeadTags:</dt> <dd><tmpl_var extraHeadTags></dd>
-<dt>groupIdEdit:</dt> <dd><tmpl_var groupIdEdit></dd>
-<dt>groupIdView:</dt> <dd><tmpl_var groupIdView></dd>
-<dt>hasRated:</dt> <dd><tmpl_var hasRated></dd>
-<dt>image.url</dt> <dd><tmpl_var image.url></dd>
-<dt>image.thumbnail</dt> <dd><tmpl_var image.thumbnail></dd>
-<dt>isHidden:</dt> <dd><tmpl_var isHidden></dd>
-<dt>isLocked:</dt> <dd><tmpl_var isLocked></dd>
-<dt>isLockedBy:</dt> <dd><tmpl_var isLockedBy></dd>
-<dt>isMarkedRead:</dt> <dd><tmpl_var isMarkedRead></dd>
-<dt>isPackage:</dt> <dd><tmpl_var isPackage></dd>
-<dt>isPrototype:</dt> <dd><tmpl_var isPrototype></dd>
-<dt>isSticky:</dt> <dd><tmpl_var isSticky></dd>
-<dt>isSystem:</dt> <dd><tmpl_var isSystem></dd>
-<dt>lastPostDate:</dt> <dd><tmpl_var lastPostDate></dd>
-<dt>lastPostId:</dt> <dd><tmpl_var lastPostId></dd>
-<dt>lineage:</dt> <dd><tmpl_var lineage></dd>
-<dt>menuTitle:</dt> <dd><tmpl_var menuTitle></dd>
-<dt>newWindow:</dt> <dd><tmpl_var newWindow></dd>
-<dt>ownerUserId:</dt> <dd><tmpl_var ownerUserId></dd>
-<dt>parentId:</dt> <dd><tmpl_var parentId></dd>
-<dt>rate.url.1:</dt> <dd><tmpl_var rate.url.1></dd>
-<dt>rate.url.2:</dt> <dd><tmpl_var rate.url.2></dd>
-<dt>rate.url.3:</dt> <dd><tmpl_var rate.url.3></dd>
-<dt>rate.url.4:</dt> <dd><tmpl_var rate.url.4></dd>
-<dt>rate.url.5:</dt> <dd><tmpl_var rate.url.5></dd>
-<dt>rating:</dt> <dd><tmpl_var rating></dd>
-<dt>rating.value:</dt> <dd><tmpl_var rating.value></dd>
-<dt>replies:</dt> <dd><tmpl_var replies></dd>
-<dt>reply.url:</dt> <dd><tmpl_var reply.url></dd>
-<dt>reply.withquote.url:</dt> <dd><tmpl_var reply.withquote.url></dd>
-<dt>revisedBy:</dt> <dd><tmpl_var revisedBy></dd>
-<dt>revisionDate:</dt> <dd><tmpl_var revisionDate></dd>
-<dt>startDate:</dt> <dd><tmpl_var startDate></dd>
-<dt>state:</dt> <dd><tmpl_var state></dd>
-<dt>stateChanged:</dt> <dd><tmpl_var stateChanged></dd>
-<dt>stateChangedBy:</dt> <dd><tmpl_var stateChangedBy></dd>
-<dt>status:</dt> <dd><tmpl_var status></dd>
-<dt>storageId:</dt> <dd><tmpl_var storageId></dd>
-<dt>subscriptionGroupId:</dt> <dd><tmpl_var subscriptionGroupId></dd>
-<dt>synopsis:</dt> <dd><tmpl_var synopsis></dd>
-<dt>tagId:</dt> <dd><tmpl_var tagId></dd>
-<dt>threadId:</dt> <dd><tmpl_var threadId></dd>
-<dt>title:</dt> <dd><tmpl_var title></dd>
-<dt>title.short:</dt> <dd><tmpl_var title.short></dd>
-<dt>url:</dt> <dd><tmpl_var url></dd>
-<dt>user.canEdit:</dt> <dd><tmpl_var user.canEdit></dd>
-<dt>user.isPoster:</dt> <dd><tmpl_var user.isPoster></dd>
-<dt>userDefined1:</dt> <dd><tmpl_var userDefined1></dd>
-<dt>userDefined2:</dt> <dd><tmpl_var userDefined2></dd>
-<dt>userDefined3:</dt> <dd><tmpl_var userDefined3></dd>
-<dt>userDefined4:</dt> <dd><tmpl_var userDefined4></dd>
-<dt>userDefined5:</dt> <dd><tmpl_var userDefined5></dd>
-<dt>userId:</dt> <dd><tmpl_var userId></dd>
-<dt>userProfile.url:</dt> <dd><tmpl_var userProfile.url></dd>
-<dt>username:</dt> <dd><tmpl_var username></dd>
-<dt>views:</dt> <dd><tmpl_var views></dd>
-</dl>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_right_column.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_right_column.tmpl
deleted file mode 100755
index b6fd2f145..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_right_column.tmpl
+++ /dev/null
@@ -1,90 +0,0 @@
-#PBtmpl0000000000000131
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-  <h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-  <p><tmpl_var description></p>
-</tmpl_if>
-
-<!-- begin position 1 -->
-<div class="firstColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position1" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position1_loop>
-	<tmpl_if showAdmin>
-            	<tr id="td<tmpl_var id>">
-            		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-         			</div></td>
-            	</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-            </tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 1 -->
-
-<!-- begin position 2 -->
-<div class="secondColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position2" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position2_loop>
-	<tmpl_if showAdmin>
-            	<tr id="td<tmpl_var id>">
-            		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-         			</div></td>
-            	</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-            </tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 2 -->
-
-<div class="endFloat">&nbsp;</div>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-            <tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-  float: left;
-  width: 65%;
-}
-.secondColumn {
-        float: left;
-        width: auto;
-        max-width: 33%;
-}
-.endFloat {
- clear: both;
-}
-</style>
-
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_search.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_search.tmpl
deleted file mode 100644
index f1498ad27..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_search.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-#PBtmpl0000000000000200
-#create
-#namespace:Search
-#url:default_search
-#title:Default Search
-#menuTitle:Default Search
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-<tmpl_if showAdmin>
-<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-  <h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-  <p><tmpl_var description></p>
-</tmpl_if>
-
-<tmpl_var form_header>
-<tmpl_var form_keywords> <tmpl_var form_submit>
-<tmpl_var form_footer>
-
-<tmpl_if session.form.doit>
-	<tmpl_loop result_set>
-		<dl>
-			<dt><a href="^/;<tmpl_var url>"><tmpl_var title></a></dt>
-			<dd><tmpl_var synopsis></dd>
-		</dl>
-	</tmpl_loop>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination">
-			<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-		</div>
-	</tmpl_if>
-</tmpl_if>
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_side_by_side.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_side_by_side.tmpl
deleted file mode 100755
index f129dbc2a..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_side_by_side.tmpl
+++ /dev/null
@@ -1,92 +0,0 @@
-#PBtmpl0000000000000135
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<!-- begin position 1 -->
-<div class="firstColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position1" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position1_loop>
-	<tmpl_if showAdmin>
-		<tr id="td<tmpl_var id>">
-		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-		</div></td>
-		</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-	</tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 1 -->
-
-<!-- begin position 2 -->
-<div class="secondColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position2" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position2_loop>
-	<tmpl_if showAdmin>
-		<tr id="td<tmpl_var id>">
-		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-		</div></td>
-		</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-	</tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 2 -->
-
-<div class="endFloat">&nbsp;</div>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-	<tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-	float: left;
-	width: 50%;
-}
-
-.secondColumn {
-	float: left;
-	width: auto;
-	max-width: 50%;
-}
-
-.endFloat {
-	clear: both;
-}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_stock_data_default_view.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_stock_data_default_view.tmpl
deleted file mode 100644
index b19dfb76e..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_stock_data_default_view.tmpl
+++ /dev/null
@@ -1,90 +0,0 @@
-#StockDataTMPL000000001
-<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>
-
-<table cellpadding="0" cellspacing="0" border="0" class="qmmt_main" width="100%">
-   <tr>
-      <td colspan="3" style="text-align: left">  
-	     <div class="qmmt_header_bar" style="padding-top: 1px; padding-bottom: 1px; border-bottom-width: 1px;">
-		    <table cellpadding="0" cellspacing="0" border="0" width="100%">   
-			  <tr>
-			     <td class="qmmt_header_text">Stock Watch</td>
-				 <td class="qmmt_header_text" style="text-align: right; padding-right: 3px; font-weight: normal;">
-				    <div id="qm_textChange_7310">
-					   <span class="qmmt_header_text" style="font-weight:normal;"><b>Last Update: </b> <tmpl_var lastUpdate.default> EDT</span></div>
-					      <script type="text/javascript">
-						     function qm_UpdateText_7310(phase){    
-							   switch (phase)    {        
-							      case 1: document.getElementById('qm_textChange_7310').innerHTML = '<span class="qmmt_header_text" style="font-weight:normal;">delayed 20 minutes</span>'; 
-                                   setTimeout("qm_UpdateText_7310(2)", 5000); 
-								   break;        
-								  case 2: document.getElementById('qm_textChange_7310').innerHTML = '<span class="qmmt_header_text" style="font-weight:normal;"><b>Last Update:&nbsp;</b> <tmpl_var lastUpdate.default> EDT</span>'; 
-                                   setTimeout("qm_UpdateText_7310(3)", 5000); 
-								   break;        
-								  case 3: document.getElementById('qm_textChange_7310').innerHTML = '<a href="http://www.quotemedia.com/" style="text-decoration:none;"><span class="qmmt_header_text" style="font-weight:normal;">Yahoo Finance</span></a>';
-                                   setTimeout("qm_UpdateText_7310(1)", 5000); 
-								   break;        
-								}        
-							 }
-							 qm_UpdateText_7310(2);
-						 </script> 
-    
-				  </td>       
-				</tr>  
-		     </table>  
-	      </div>  
-	   </td> 
-	</tr>  
-	<tr>  
-	   <td>       
-	      <script type="text/javascript"> 
-		     function openDetail_2961(symbol) {     
-			    var w = 670;   
-				var h = 286;   
-				var winl = (screen.width - w) / 2;   
-				var wint = (screen.height - h) / 2;   
-			    var winprops ='height='+h+',width='+w+',top='+wint+',left='+winl+',toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=0,resizable=1';   
-				win = window.open("<tmpl_var stock.display.url>" + escape(symbol), "DetailedQuote", winprops);
-				if (parseInt(navigator.appVersion) >= 4) {       
-				   win.window.focus();   
-				}   
-		      }
-		   </script>    
-		   <table cellpadding="0" cellspacing="0" style="padding: 2px;" width="100%">   
-		      <tr class="qmmt_main">
-			     <td class="qmmt_text" style="font-weight: bold; text-align: left; padding-left: 3px;white-space:nowrap;"> Name </td>        
-				 <td class="qmmt_text" style="font-weight: bold; text-align: left; padding-left: 3px; white-space:nowrap;width:8%;">Symbol</td>    
-				 <td class="qmmt_text" style="font-weight: bold; text-align: right; white-space:nowrap;width:9%;">Last</td>
-				 <td class="qmmt_text" style="font-weight: bold; text-align: center; white-space:nowrap;width:4%">Tick</td>        
-				 <td class="qmmt_text" style="font-weight: bold; text-align: right; white-space:nowrap; width:7%;">Chg</td>         
-	          </tr>
-			  <tmpl_loop stocks.loop>
-			     <tr class='<tmpl_if __ODD__>qmmt_cycle<tmpl_else>qmmt_main</tmpl_if>'>            
-			        <td class="qmmt_text" style="padding-left: 3px;white-space:nowrap;"><tmpl_var stocks.name></td>
-				    <td class="qmmt_text" style="text-align: left; padding-left: 3px;white-space:nowrap;">
-				       <a class="qmmt" style="text-decoration: none;" href="javascript:openDetail_2961('<tmpl_var stocks.symbol>')"><tmpl_var stocks.symbol></a>
-			        </td>        
-				    <td class="qmmt_text" style="text-align: right;white-space:nowrap;"><tmpl_var stocks.last></td>
-				    <td class="qmmt_text" style="text-align: center;white-space:nowrap;" align="right">
-					   <img src="<tmpl_var extrasFolder>/<tmpl_var stocks.net.icon>" alt="" />            
-				    </td>
-				    <td class="qmmt_text<tmpl_if stocks.net.isUp>_up<tmpl_else><tmpl_if stocks.net.isDown>_down</tmpl_if></tmpl_if>" style="text-align: right;whitespace:nowrap;"><tmpl_var stocks.net></td>
-			     </tr>          
-			  </tmpl_loop>  
-			</table>      
-	     </td> 
-	  </tr>
-  </table>
-~~~
-<link rel="stylesheet" type="text/css" href="<tmpl_var extrasFolder>/tools.css" />
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_stockdata_default_display.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_stockdata_default_display.tmpl
deleted file mode 100644
index 6b07edb0c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_stockdata_default_display.tmpl
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-<title></title>
-<style type="text/css">
-	.qmmt_tab
-	{
-	    background-color: #eeeeee;
-	    border-top-color: #cccccc;
-	    border-right: 1px solid #cccccc;	    
-	}
-	.qmmt_tabactive
-	{
-	    border-right: 1px solid #cccccc;	    
-	}
-	body {
-		color:#000;
-		background-color:#f1f1f1;
-	}
-	a:link, a:visited {
-		color:#0000cc;
-	}
-	a:hover {
-		color:#FF0000;
-	}
-</style>
-<link rel="stylesheet" type="text/css" href="<tmpl_var extrasFolder>/tools.css" />
-</head>
-<body>
-<div><a name="<tmpl_var assetId>"></a></div>
-<script type="text/javascript">
-   var symbol = "<tmpl_var stocks.symbol>";
-   function isIE() {
-      var ua = navigator.userAgent.toLowerCase();
-	  var isIE = ( (ua.indexOf("msie") != -1) && (ua.indexOf("opera") == -1) && (ua.indexOf("webtv") == -1) );
-	  return (isIE);      
-   }
-   
-   function enableTab(obj, scale){    
-      for (i=0; i < 7; i++)    {        
-	     document.getElementById('qm_ch_tab' + i + '_9350').className = (i == obj) ? 'qmmt_tabactive' : 'qmmt_tab';
-		 document.getElementById('qm_ch_tab' + i + '_9350').style.cursor = (i == obj) ? 'default' : (isIE()) ? 'hand': 'pointer';
-		 document.getElementById('qm_ch_tab' + i + '_9350').style.borderTop = (i == obj) ? '0px' : '1px solid';    
-	  }
-	  document.getElementById('chartimg').src = "http://ichart.finance.yahoo.com/z?s=" + symbol + "&t=" + scale + "&q=l&l=off&z=s&p=s";
-   }
-</script>
-
-<table cellpadding="0" cellspacing="0" border="0" class="qmmt_main" width="650"> 
-  <tr>  
-     <td style="text-align: center;">  
-	    <div class="qmmt_header_bar" style="padding-bottom: 1px; border-bottom-width: 1px; ">  
-		   <table cellpadding="0" cellspacing="0" border="0" width="100%">   
-		      <tr>    
-			     <td><span class="qmmt_header_text" style="padding-left:5px;"><tmpl_var stocks.name> (<tmpl_var stocks.symbol>)</span></td>    
-				 <td align="right" style="padding-right:3px;">
-				    <span class="qmmt_header_text" style="text-align: right; font-weight:normal;">
-					<div style="white-space:nowrap;" id="qm_textChange_5920">1:23 PM EDT</div>
-					<script type="text/javascript">
-					   function qm_UpdateText_5920(phase){    
-					      switch (phase)    {        
-						     case 1: 
-							    document.getElementById('qm_textChange_5920').innerHTML = '<span class="qmmt_header_text" style="font-weight:normal;">Delayed</span>'; 
-                                setTimeout("qm_UpdateText_5920(2)", 5000); 
-								break;        
-						     case 2: 
-							    document.getElementById('qm_textChange_5920').innerHTML = '<span class="qmmt_header_text" style="font-weight:normal;">1:23 PM EDT</span>'; 
-                                setTimeout("qm_UpdateText_5920(3)", 5000); 
-								break;        
-							 case 3: 
-							    document.getElementById('qm_textChange_5920').innerHTML = '<a href="http://finance.yahoo.com/" style="text-decoration:none;"><span class="qmmt_header_text" style="font-weight:normal;">Yahoo Finance</span></a>'; 
-                                 setTimeout("qm_UpdateText_5920(1)", 5000); 
-								 break;            
-						  }        
-					   }
-					   qm_UpdateText_5920(2);
-				    </script>    
-					</span>
-				 </td>
-			  </tr>  
-		   </table>
-		</div>
-     </td>
-  </tr> 
-  <tr>  
-     <td style="text-align: center;">  
-	    <table cellpadding="2" cellspacing="0" border="0" width="100%">   
-		   <tr>
-		      <td style="text-align: center;width:40%">    
-			     <img id="chartimg" style="width:350px;height:205px;vertical-align:center;" src="http://ichart.finance.yahoo.com/z?s=<tmpl_var stocks.symbol>&t=1d&q=l&l=off&z=s&p=s" alt="" />    
-                     <table cellpadding="0" cellspacing="0" border="0" width="100%">  
-					    <tr>
-						   <td id="qm_ch_tab0_9350" class="qmmt_tabactive" onclick="enableTab('0', '1d')" style="cursor: default; border-left: 0px; border-bottom: 0px; border-top: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">Today</td>
-                           <td id="qm_ch_tab1_9350" class="qmmt_tab" onclick="enableTab('1', '5d')" style="cursor: default; border-bottom: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">5d</td>
-                           <td id="qm_ch_tab2_9350" class="qmmt_tab" onclick="enableTab('2', '1m')" style="cursor: default; border-bottom: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">1m</td>
-                           <td id="qm_ch_tab3_9350" class="qmmt_tab" onclick="enableTab('3', '3m')" style="cursor: default; border-bottom: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">3m</td>
-                           <td id="qm_ch_tab4_9350" class="qmmt_tab" onclick="enableTab('4', '1y')" style="cursor: default; border-bottom: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">1y</td>
-                           <td id="qm_ch_tab5_9350" class="qmmt_tab" onclick="enableTab('5', '5y')" style="cursor: default; border-bottom: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">5y</td>
-						   <td id="qm_ch_tab6_9350" class="qmmt_tab" onclick="enableTab('6', 'my')" style="cursor: default; border-right: 0px; border-bottom: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">20y</td>
-                        </tr>
-					 </table>    
-			      </td>
-				  <td align="center" style="width:30%">
-				     <table cellpadding="2" cellspacing="0" border="0" width="95%">
-					    <tr class="qmmt_main">
-						   <td class="qmmt_text">Last Price</td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.last></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Market Cap </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.cap></td>
-						</tr>           
-						<tr class="qmmt_main"><td class="qmmt_text"> Change </td>
-						   <td class="qmmt_text<tmpl_if stocks.net.isUp>_up<tmpl_else><tmpl_if stocks.net.isDown>_down</tmpl_if></tmpl_if>" style="text-align: right; font-weight: bold;">
-						      <img style="vertical-align:center;" src='<tmpl_var extrasFolder>/<tmpl_var stocks.net.icon>' alt="" /> <tmpl_var stocks.net>
-						   </td>
-                        </tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Open </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.open></td>
-						</tr>
-						<tr class="qmmt_main">
-						   <td class="qmmt_text"> Day High </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.high></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text">Bid</td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.bid></td>
-						</tr>    
-						<tr class="qmmt_main">
-						   <td class="qmmt_text"> 52 Wk High </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.year_high></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> E.P.S. </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.eps></td>
-						</tr>    
-						<tr class="qmmt_main">
-						   <td class="qmmt_text"> Ex-Div Date </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.ex_div></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Yield </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.yield></td>
-						</tr>
-				     </table>
-				  </td>
-				  <td align="center" style="width:30%;">
-				     <table cellpadding="2" cellspacing="0" border="0" width="95%">
-					    <tr class="qmmt_main">
-						   <td class="qmmt_text"> Last Trade </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var lastUpdate.us></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Volume </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.volume.millions> m</td>
-						</tr>
-						<tr class="qmmt_main">
-						   <td class="qmmt_text">% Change </td>
-						   <td class="qmmt_text<tmpl_if stocks.net.isUp>_up<tmpl_else><tmpl_if stocks.net.isDown>_down</tmpl_if></tmpl_if>"  style="text-align: right; font-weight: bold;"><tmpl_var stocks.p_change>%</td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Prev Close </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.close></td>
-						</tr>
-						<tr class="qmmt_main">
-						   <td class="qmmt_text"> Day Low </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.low></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Ask </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.ask></td>
-						</tr>
-						<tr class="qmmt_main">
-						   <td class="qmmt_text"> 52 Wk Low </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.year_low></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> P/E Ratio </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.pe></td>
-						</tr>    
-						<tr class="qmmt_main">
-						   <td class="qmmt_text"> Dividend </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.div></td>
-						</tr>     
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Exchange </td> 
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.exchange></td>
-						</tr>
-				     </table>
-				  </td>
-			   </tr>
-			</table>
-	     </td>
-	  </tr>
-   </table>
-   
-<div style="text-align:center;">
-<table cellpadding="0" cellspacing="0" border="0" width="650">
-<tr>
-   <td>
-      <div class="qmmt_text" style="text-align:right;"><br /><a href="javascript:window.close()" style="color:#0000cc">CLOSE</a></div>
-   </td>
-</tr>
-</table>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_style_admin_console.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_style_admin_console.tmpl
deleted file mode 100644
index e522b4721..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_style_admin_console.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-#PBtmpl0000000000000137
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>WebGUI <tmpl_var session.webgui.version>-<tmpl_var session.webgui.status> Admin Console</title>
-	<link rel="icon" href="^Extras(favicon.png);" type="image/png" />
-	<link rel="shortcut icon" href="^Extras(favicon.ico);" />
-	<tmpl_var head.tags>
-</head>
-<body>
-	<tmpl_var body.content>
-</body>
-</html>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_subscription_code_redemption.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_subscription_code_redemption.tmpl
deleted file mode 100644
index 521672537..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_subscription_code_redemption.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-#PBtmpl0000000000000053
-<tmpl_if batchDescription>
-Batch: <tmpl_var batchDescription>
-</tmpl_if>
-
-<tmpl_var message><br />
-<tmpl_var codeForm>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_subscriptionitem_default_template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_subscriptionitem_default_template.tmpl
deleted file mode 100644
index 46c8d776b..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_subscriptionitem_default_template.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-#PBtmpl0000000000000046
-<h2><tmpl_var name></h2>
-<tmpl_var description><br>
-<br />
-<br />
-$ <tmpl_var price><br />
-<a href="<tmpl_var url>">Subscribe now</a><br />
\ 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
deleted file mode 100644
index bce3c3067..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_syndicated_articles.tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-#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_synopsis.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_synopsis.tmpl
deleted file mode 100644
index 23eff38ed..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_synopsis.tmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-#PBtmpl0000000000000136
-		<tmpl_if displayTitle>
-		<h2><tmpl_var title></h2>
-		</tmpl_if>
-		<tmpl_if description>
-			<p><tmpl_var description></p>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-<tmpl_var controls>
-</tmpl_if>
-<div class="synopsis">
-<tmpl_loop page_loop>
-   <div class="synopsis_title">
-      <a href="<tmpl_var page.url>"><tmpl_var page.menuTitle></a>
-   </div>
-   <tmpl_if page.indent>
-      <div class="synopsis_sub">
-         <tmpl_var page.synopsis>
-      </div>
-   <tmpl_else>
-      <div class="synopsis_summary">
-         <tmpl_var page.synopsis>
-      </div>
-   </tmpl_if>
-</tmpl_loop>
-</div>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_tab_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_tab_form.tmpl
deleted file mode 100644
index e29d5110f..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_tab_form.tmpl
+++ /dev/null
@@ -1,126 +0,0 @@
-#PBtmpl0000000000000116
-<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 error_loop>
-	<ul class="fontSettings">
-		<tmpl_loop error_loop>
-			<li><b><tmpl_var error.message></b></li>
-		</tmpl_loop>
-	</ul>
-</tmpl_if>
-
-<tmpl_if description>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<tmpl_if canEdit>
-	<div class="dataControls">
-		<a href="<tmpl_var entryList.url>"><tmpl_var entryList.label></a>
-			&bull; <a href="<tmpl_var export.tab.url>"><tmpl_var export.tab.label></a>
-		<tmpl_if entryId>
-			&bull; <a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-			&bull; <a href="<tmpl_var addField.url>"><tmpl_var addField.label></a>
-			&bull; <a href="<tmpl_var addTab.url>"><tmpl_var addTab.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_if>
-<tmpl_var form.start>
-
-<div class="tabs">
-	<tmpl_loop tab_loop>
-		<span onclick="toggleTab(<tmpl_var tab.sequence>)" id="tab<tmpl_var tab.sequence>" class="tab"><tmpl_var tab.label>
-		<tmpl_if session.var.adminOn>
-			<tmpl_if canEdit>
-				<tmpl_var tab.controls>
-			</tmpl_if>
-		</tmpl_if>
-		</span>
-	</tmpl_loop>
-</div>
-<tmpl_loop tab_loop>
-	<tmpl_var tab.start>
-		<table class="tabForm">
-			<tmpl_loop tab.field_loop>
-				<tmpl_unless tab.field.isHidden>
-						<tr>
-							<td class="formDescription" valign="top">
-								<tmpl_if session.var.adminOn>
-									<tmpl_if canEdit>
-										<tmpl_var tab.field.controls>
-									</tmpl_if>
-								</tmpl_if>
-								<tmpl_var tab.field.label>
-							</td>
-							<td class="tableData" valign="top">
-								<tmpl_if tab.field.isDisplayed>
-									<tmpl_var tab.field.value>
-								<tmpl_else>
-									<tmpl_var tab.field.form>
-								</tmpl_if>
-								<tmpl_if tab.field.isRequired>*</tmpl_if>
-								<span class="formSubtext">
-									<br />
-									<tmpl_var tab.field.subtext>
-								</span>
-							</td>
-						</tr>
-				</tmpl_unless>
-			</tmpl_loop>
-			<tr>
-				<td colspan="2">
-					<span class="tabSubtext"><tmpl_var tab.subtext></span>
-				</td>
-			</tr>
-		</table>
-		<br />
-		<tmpl_var form.save>
-	<tmpl_var tab.end>
-</tmpl_loop>
-<tmpl_var tab.init>
-<tmpl_var form.end>
-
-
-~~~
-<style type="text/css">
-h2{
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.fontSettings{
-	font-family:arial;
-	font-size:9pt;
-}
-.tabForm td{
-	font-family:arial;
-	font-size:9pt;
-}
-.dataControls
-{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-
-.dataControls a
-{
-	color:white;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_table_default_page.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_table_default_page.tmpl
deleted file mode 100755
index a411f017d..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_table_default_page.tmpl
+++ /dev/null
@@ -1,45 +0,0 @@
-#PBtmpl000000000table54
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position1" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position1_loop>
-	<tmpl_if showAdmin>
-		<tr id="td<tmpl_var id>"><td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<table border="0">
-	<tr>
-		<td class="content"><tmpl_var dragger.icon><tmpl_var content></td>
-	</tr>
-	</table>
-
-	<tmpl_if showAdmin>
-		</div></td></tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-	</tbody></table>
-</tmpl_if>
-</div>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-	<tmpl_var dragger.init>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_table_left_column.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_table_left_column.tmpl
deleted file mode 100644
index 32ed968a2..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_table_left_column.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-#PBtmpl00000000table125
-#title:Left Column (Table)
-#menuTitle:Left Column (Table)
-#url:left_column_table
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>

<tmpl_if showAdmin>
<p><tmpl_var controls></p>
</tmpl_if>


<tmpl_if displayTitle>
  <h2><tmpl_var title></h2>
</tmpl_if>
-
-<table cellpadding="5">
-<tr>
-	<td class="firstColumn" align="left" valign="top">
-		<!-- begin position 1 -->
		<div class="layoutColumnPadding">
		<tmpl_if showAdmin>
			<table border="0" id="position1" class="content"><tbody>
		</tmpl_if>

		<tmpl_loop position1_loop>
			<tmpl_if showAdmin>
		            	<tr id="td<tmpl_var id>">
		            		<td><div id="td<tmpl_var id>_div" class="dragable">
			</tmpl_if>

			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>

			<tmpl_if showAdmin>
		         			</div></td>
		            	</tr>
			</tmpl_if>
		</tmpl_loop>

		<tmpl_if showAdmin>
		            </tbody></table>
		</tmpl_if>
		</div>
		<!-- end position 1 -->	
-	</td>
-	<td class="secondColumn" align="left" valign="top">
-		<!-- begin position 2 -->
		<div class="layoutColumnPadding">
		<tmpl_if showAdmin>
			<table border="0" id="position2" class="content"><tbody>
		</tmpl_if>

		<tmpl_loop position2_loop>
			<tmpl_if showAdmin>
		            	<tr id="td<tmpl_var id>">
		            		<td><div id="td<tmpl_var id>_div" class="dragable">
			</tmpl_if>

			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>

			<tmpl_if showAdmin>
		         			</div></td>
		            	</tr>
			</tmpl_if>
		</tmpl_loop>

		<tmpl_if showAdmin>
		            </tbody></table>
		</tmpl_if>
		</div>
		<!-- end position 2 -->	
-	
-	</td>
-</tr>
-</table>
-
<tmpl_if description>
  <p><tmpl_var description></p>
</tmpl_if>

<tmpl_if showAdmin>
	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
            <tmpl_var dragger.init>
</tmpl_if>
-~~~
-<style type="text/css">
.firstColumn {
  width: 35%;
}
.secondColumn {
        max-width: 65%;
}
</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_table_news.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_table_news.tmpl
deleted file mode 100644
index a906f0d31..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_table_news.tmpl
+++ /dev/null
@@ -1,148 +0,0 @@
-#PBtmpl00000000table094
-#title:News (Table)
-#menuTitle:News (Table)
-#url:news_table
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellpadding="5">
-<tr>
-	<td align="left" valign="top" colspan="2">
-		<!-- begin position 1 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position1" class="content"><tbody>
-		</tmpl_if>
-		<tmpl_loop position1_loop>
-			<tmpl_if showAdmin>
-				<tr id="td<tmpl_var id>">
-				<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-				</div></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-			</tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 1 -->	
-	</td>
-</tr>
-<tr>
-	<td class="firstColumn" align="left" valign="top">
-		<!-- begin position 2 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position2" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position2_loop>
-			<tmpl_if showAdmin>
-				<tr id="td<tmpl_var id>">
-				<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-				</div></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-			</tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 2 -->	
-	</td>
-	<td class="secondColumn" align="left" valign="top">
-		<!-- begin position 3 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position3" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position3_loop>
-			<tmpl_if showAdmin>
-				<tr id="td<tmpl_var id>">
-				<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-				</div></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-			</tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 3 -->	
-	</td>
-</tr>	
-<tr>
-	<td align="left" valign="top" colspan="2">
-		<!-- begin position 4 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position4" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position4_loop>
-			<tmpl_if showAdmin>
-				<tr id="td<tmpl_var id>">
-				<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-				</div></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-			</tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 4 -->	
-	</td>
-</tr>
-</table>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-	<tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-	width: 50%;
-}
-.secondColumn {
-	width: 50%;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_table_one_over_three.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_table_one_over_three.tmpl
deleted file mode 100644
index 2d7dd96cf..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_table_one_over_three.tmpl
+++ /dev/null
@@ -1,151 +0,0 @@
-#PBtmpl00000000table109
-#title:One Over Three (Table)
-#menuTitle:One Over Three (Table)
-#url:one_over_three_table
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-  <h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-  <p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellpadding="5">
-<tr>
-	<td colspan="3" align="left" valign="top">
-		<!-- begin position 1 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position1" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position1_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 1 -->	
-	</td>
-</tr>
-<tr>
-	<td class="firstColumn" align="left" valign="top">
-		<!-- begin position 2 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position2" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position2_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 2 -->	
-	</td>
-	<td class="secondColumn" align="left" valign="top">
-		<!-- begin position 3 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position3" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position3_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 3 -->	
-	</td>
-	<td class="thirdColumn" align="left" valign="top">
-		<!-- begin position 4 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position4" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position4_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 4 -->	
-	</td>
-</tr>
-</table>
-
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-            <tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-	width: 33%;
-}
-.secondColumn {
-    width: 33%;
-}
-.thirdColumn {
-    width: 33%;
-}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_table_right_column.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_table_right_column.tmpl
deleted file mode 100644
index 9df9f5c3c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_table_right_column.tmpl
+++ /dev/null
@@ -1,90 +0,0 @@
-#PBtmpl00000000table131
-#title:Right Column (Table)
-#menuTitle:Right Column (Table)
-#url:right_column_table
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-  <h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-  <p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellspacing="5">
-<tr>
-	<td class="firstColumn" valign="top" align="left">
-		<!-- begin position 1 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position1" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position1_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 1 -->	
-	</td>
-	<td class="secondColumn" valign="top" align="left">
-		<!-- begin position 2 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position2" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position2_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 2 -->	
-	</td>
-</tr>
-</table>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-            <tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-	width: 65%;
-}
-.secondColumn {
-    width: 35%;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_table_side_by_side.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_table_side_by_side.tmpl
deleted file mode 100644
index 645064c42..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_table_side_by_side.tmpl
+++ /dev/null
@@ -1,91 +0,0 @@
-#PBtmpl00000000table135
-#title:Side By Side (Table)
-#menuTitle:Side By Side (Table)
-#url:side_by_side_table
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<table>
-<tr>
-	<td class="firstColumn" valign="top" align="left">
-		<!-- begin position 1 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position1" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position1_loop>
-			<tmpl_if showAdmin>
-				<tr id="td<tmpl_var id>">
-				<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-				</div></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-			</tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 1 -->	
-	</td>
-	<td class="secondColumn" valign="top" align="left">
-		<!-- begin position 2 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position2" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position2_loop>
-			<tmpl_if showAdmin>
-				<tr id="td<tmpl_var id>">
-				<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-				</div></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-			</tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 2 -->	
-	</td>
-</tr>
-</table>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-	<tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-	width: 50%;
-}
-
-.secondColumn {	
-	width:50%;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_table_three_over_one.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_table_three_over_one.tmpl
deleted file mode 100644
index 4b43c44d5..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_table_three_over_one.tmpl
+++ /dev/null
@@ -1,150 +0,0 @@
-#PBtmpl00000000table118
-#title:Three Over One (Table)
-#menuTitle:Three Over One (Table)
-#url:three_over_one_table
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-<p><tmpl_var controls></p>
-</tmpl_if>
-
-
-<tmpl_if displayTitle>
-  <h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-  <p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellpadding="5">
-<tr>
-	<td class="firstColumn" align="left" valign="top">
-		<!-- begin position 1 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position1" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position1_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 1 -->	
-	</td>
-	<td class="secondColumn" align="left" valign="top">
-		<!-- begin position 2 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position2" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position2_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 2 -->	
-	</td>	
-	<td class="thirdColumn" align="left" valign="top">
-		<!-- begin position 3 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position3" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position3_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 3 -->	
-	</td>
-</tr>
-<tr>
-	<td align="left" valign="top" colspan="3">
-		<!-- begin position 4 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position4" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position4_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 4 -->	
-	</td>
-</tr>
-</table>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-            <tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-	width: 33%;
-}
-.secondColumn {
-    width: 33%;
-}
-.thirdColumn {
-	width: 33%;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_tabs.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_tabs.tmpl
deleted file mode 100644
index 65ab44ada..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_tabs.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-#PBtmpl0000000000000124
-		<tmpl_if displayTitle>
-		<h2><tmpl_var title></h2>
-		</tmpl_if>
-		<tmpl_if description>
-			<p><tmpl_var description></p>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-<tmpl_var controls>
-</tmpl_if>
-<tmpl_loop page_loop>
-   <tmpl_if page.isCurrent>
-      <span class="rootTabOn">
-   <tmpl_else>
-      <span class="rootTabOff">
-   </tmpl_if>
-   <a  <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
-   </span>
-</tmpl_loop>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_three_columns.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_three_columns.tmpl
deleted file mode 100644
index cfa72e062..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_three_columns.tmpl
+++ /dev/null
@@ -1,171 +0,0 @@
-#PBtmpl0000000000000110
-<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>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-	<br />
-</tmpl_if>
-
-<table width="100%" cellpadding="3" cellspacing="0" class="threeColumns">
-<tr>
-	<td align="center">
-		<tmpl_if thumbnail1>
-			<a href="<tmpl_var image1>"><img src="<tmpl_var thumbnail1>" alt="<tmpl_var thumbnail1>" class="noBorder" /></a>
-		</tmpl_if>
-	</td>
-	<td align="center">
-		<tmpl_if thumbnail2>
-			<a href="<tmpl_var image2>"><img src="<tmpl_var thumbnail2>" alt="<tmpl_var thumbnail2>" class="noBorder" /></a>
-		</tmpl_if>
-	</td>
-	<td align="center">
-		<tmpl_if thumbnail3>
-			<a href="<tmpl_var image3>"><img src="<tmpl_var thumbnail3>" alt="<tmpl_var thumbnail3>" class="noBorder" /></a>
-		</tmpl_if>
-	</td>
-</tr>
-</table>
-
-<table border="0" cellpadding="0" cellspacing="5" width="100%" class="threeColumns">
-<tr>
-	<td valign="top" class="tableData" width="35%">
-		<b>Features</b><br />
-		<tmpl_if session.var.adminOn>
-			<a href="<tmpl_var addfeature.url>"><tmpl_var addfeature.label></a><p />
-		</tmpl_if>
-		<tmpl_loop feature_loop>
-			&middot;<tmpl_if session.var.adminOn><tmpl_var feature.controls></tmpl_if><tmpl_var feature.feature><br />
-		</tmpl_loop>
-		<p />
-		<b>Benefits</b><br/>
-		<tmpl_if session.var.adminOn>
-			<a href="<tmpl_var addBenefit.url>"><tmpl_var addBenefit.label></a>
-			<p />
-		</tmpl_if>
-		<tmpl_loop benefit_loop>
-			&middot;<tmpl_if session.var.adminOn><tmpl_var benefit.controls></tmpl_if><tmpl_var benefit.benefit><br />
-		</tmpl_loop>
-		<p />
-	</td>
-	<td valign="top" class="tableData" width="35%">
-		<b>Specifications</b><br />
-		<tmpl_if session.var.adminOn>
-			<a href="<tmpl_var addSpecification.url>"><tmpl_var addSpecification.label></a><p />
-		</tmpl_if>
-		<tmpl_loop specification_loop>
-			&middot;<tmpl_if session.var.adminOn><tmpl_var specification.controls></tmpl_if><b><tmpl_var specification.label>:</b> <tmpl_var specification.specification> <tmpl_var specification.units><br />
-		</tmpl_loop>
-		<p />
-		<b>Accessories</b><br />
-		<tmpl_if session.var.adminOn>
-			<a href="<tmpl_var addaccessory.url>"><tmpl_var addaccessory.label></a>
-			<p />
-		</tmpl_if>
-		<tmpl_loop accessory_loop>
-			&middot;<tmpl_if session.var.adminOn><tmpl_var accessory.controls></tmpl_if><a href="<tmpl_var accessory.url>"><tmpl_var accessory.title></a><br />
-		</tmpl_loop>
-		<p />
-		<b>Related Products</b><br />
-		<tmpl_if session.var.adminOn>
-			<a href="<tmpl_var addRelatedProduct.url>"><tmpl_var addRelatedProduct.label></a>
-			<p />
-		</tmpl_if>
-		<tmpl_loop relatedproduct_loop>
-			&middot;<tmpl_if session.var.adminOn><tmpl_var RelatedProduct.controls></tmpl_if><a href="<tmpl_var relatedproduct.url>"><tmpl_var relatedproduct.title></a><br />
-		</tmpl_loop>
-		<p />
-	</td>
-	<td class="tableData" valign="top" width="30%">
-		<tmpl_if price>
-			<b>Price:</b> <tmpl_var price><br />
-		</tmpl_if>
-		<tmpl_if productnumber>
-			<b>Product Number:</b> <tmpl_var productNumber><br />
-		</tmpl_if>
-		<br />
-		<tmpl_if brochure.url>
-			<a href="<tmpl_var brochure.url>"><img src="<tmpl_var brochure.icon>" alt="<tmpl_var brochure.icon>" class="noBorder" align="absmiddle" /><tmpl_var brochure.label></a><br />
-		</tmpl_if>
-		<tmpl_if manual.url>
-			<a href="<tmpl_var manual.url>"><img src="<tmpl_var manual.icon>" alt="<tmpl_var manual.icon>" class="noBorder" align="absmiddle" /><tmpl_var manual.label></a><br />
-		</tmpl_if>
-		<tmpl_if warranty.url>
-			<a href="<tmpl_var warranty.url>"><img src="<tmpl_var warranty.icon>" alt="<tmpl_var warranty.icon>" class="noBorder" align="absmiddle" /><tmpl_var warranty.label></a><br />
-		</tmpl_if>
-	</td>
-</tr>
-</table>
-
-
-~~~
-<style type="text/css">
-.productFeatureHeader {
-	font-weight: bold;
-	font-size: 15px;
-}
-.productSpecificationHeader {
-	font-weight: bold;
-	font-size: 15px;
-}
-.productRelatedHeader{
-	font-weight: bold;
-	font-size: 15px;
-}
-.productAccessoryHeader {
-	font-weight: bold;
-	font-size: 15px;
-}
-.productBenefitHeader {
-	font-weight: bold;
-	font-size: 15px;
-}
-.productFeature {
-	font-size: 12px;
-}
-.productSpecification {
-	font-size: 12px;
-}
-.productRelated {
-	font-size: 12px;
-}
-.productAccessory {
-	font-size: 12px;
-}
-.productBenefit {
-	font-size: 12px;
-}
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.noBorder {
-	border:none;
-}
-.threeColumns {
-	border:solid gray 1px;
-}
-.threeColumns td {
-	font-family:arial;
-	font-size:9pt;
-}
-.threeColumns .tableData {
-	border-right:solid gray 1px;
-}
-.fontSettings {
-	font-family:arial;
-	font-size:9pt;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_three_over_1.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_three_over_1.tmpl
deleted file mode 100755
index 99aca349d..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_three_over_1.tmpl
+++ /dev/null
@@ -1,146 +0,0 @@
-#PBtmpl0000000000000118
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-  <h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-  <p><tmpl_var description></p>
-</tmpl_if>
-
-<!-- begin position 1 -->
-<div class="firstColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position1" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position1_loop>
-	<tmpl_if showAdmin>
-            	<tr id="td<tmpl_var id>">
-            		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-         			</div></td>
-            	</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-            </tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 1 -->
-
-<!-- begin position 2 -->
-<div class="secondColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position2" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position2_loop>
-	<tmpl_if showAdmin>
-            	<tr id="td<tmpl_var id>">
-            		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-         			</div></td>
-            	</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-            </tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 2 -->
-
-<!-- begin position 3 -->
-<div class="thirdColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position3" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position3_loop>
-	<tmpl_if showAdmin>
-            	<tr id="td<tmpl_var id>">
-            		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-         			</div></td>
-            	</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-            </tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 3 -->
-
-<div class="endFloat">&nbsp;</div>
-
-<!-- begin position 4 -->
-<div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position4" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position4_loop>
-	<tmpl_if showAdmin>
-            	<tr id="td<tmpl_var id>">
-            		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-         			</div></td>
-            	</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-            </tbody></table>
-</tmpl_if>
-</div>
-<!-- end position 4 -->
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-            <tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-  float: left;
-  width: 33%;
-}
-.secondColumn {
-        float: left;
-        width: 33%;
-}
-.thirdColumn {
-        float: left;
-        width: auto;
-        max-width: 33%;
-}
-.endFloat {
- clear: both;
-}
-</style>
-
-
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_title_link_list.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_title_link_list.tmpl
deleted file mode 100644
index 24bc48b52..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_title_link_list.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-#wCIc38CvNHUK7aY92Ww4SQ
-<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.canPost>
-	<a href="<tmpl_var add.url>"> <tmpl_var addlink.label></a><p />
-</tmpl_if>
-
-<tmpl_loop post_loop>
-	<tmpl_if user.isPoster>
-		<tmpl_unless session.var.adminOn>[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]</tmpl_unless><br />
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if session.var.adminOn>
-			<tmpl_var controls>
-		<tmpl_else>
-			<tmpl_unless user.isPoster>
-				<tmpl_unless session.var.adminOn>[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]</tmpl_unless><br />
-			</tmpl_unless>
-		</tmpl_if>
-		<br />
-	</tmpl_if>
-	<b>&middot;</b> <a href="<tmpl_var userDefined1>"<tmpl_if userDefined2>target="_blank"</tmpl_if> class="linkTitle"><tmpl_var title></a><br />
-	<tmpl_if content>
-		<span class="linkTitleContent"><tmpl_var content></span>
-	</tmpl_if>
-
-	<p />
-</tmpl_loop>
-
-~~~
-<style type="text/css">
-.linkTitle{
-	font-family:arial;
-	font-size:9pt;			
-	color:#29587E;				
-}
-
-.linkTitle:hover
-{
-	background-color:#FFFFDF;
-}
-
-.linkTitleContent
-{
-	-moz-box-sizing:border-box;	
-	margin-top:1px;
-	margin-left:10px;
-	padding:2px;
-	font-family:arial;
-	font-size:9pt;	
-	display:block;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_topics.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_topics.tmpl
deleted file mode 100644
index 3cc92327c..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_topics.tmpl
+++ /dev/null
@@ -1,120 +0,0 @@
-#PBtmpl0000000000000079
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p class="postControls">
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&bull;
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-	</tmpl_if>
-</p>
-
-<tmpl_loop post_loop>
-	<tmpl_if user.isPoster>
-		<tmpl_unless session.var.adminOn>
-			<div>[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]</div>
-		</tmpl_unless>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<div>
-			<tmpl_if session.var.adminOn>
-				<tmpl_var controls>
-			<tmpl_else>
-				<tmpl_unless user.isPoster>
-					<tmpl_unless session.var.adminOn>
-						[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-					</tmpl_unless>
-				</tmpl_unless>
-			</tmpl_if>
-			(<a href="<tmpl_var url>"><tmpl_var status></a>)
-		</div>
-	</tmpl_if>
-	<h2 class="topicsTitle"><tmpl_var title></h2>
-	<span class="topicContent"><tmpl_var content></span>
-	<p />
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-
-
-~~~
-<style type="text/css">
-.postControls 
-{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:95%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-}
-
-.pagination
-{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:95%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-}
-
-.postControls a
-{
-	color:white;
-}		
-
-.pagination a
-{
-	color:white;
-}
-
-.topicsTitle
-{
-	-moz-box-sizing:border-box;
-	width:95%;
-	border-bottom:solid silver 1px;
-	margin-bottom:3px;
-	font-family:arial;
-}
-
-.topicContent
-{
-	-moz-box-sizing:border-box;
-	font-family:arial;
-	font-size:9pt;
-	width:95%;
-	display:block;
-	border:solid silver 1px;
-	padding:3px;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_traditional_with_thumbnails.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_traditional_with_thumbnails.tmpl
deleted file mode 100644
index bdccd72aa..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_traditional_with_thumbnails.tmpl
+++ /dev/null
@@ -1,135 +0,0 @@
-#PBtmpl0000000000000097
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p class="pagination">
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&bull;
-	</tmpl_unless>
-	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-</p>
-
-<table width="100%">
-<tr>
-	<tmpl_if user.isModerator>
-		<td class="forumHead"><tmpl_var status.label></td>
-	</tmpl_if>
-	<td class="forumHead"><a href="<tmpl_var sortby.title.url>"><tmpl_var title.label></a></td>
-	<td class="forumHead"><tmpl_var thumbnail.label></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.date.url>"><tmpl_var date.label></a></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.username.url>"><tmpl_var by.label></a></td>
-</tr>
-<tmpl_loop post_loop>
-	<tr>
-		<tmpl_if user.isModerator>
-			<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var status></td>
-		</tmpl_if>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a><tmpl_if user.isPoster> (<tmpl_var status>)</tmpl_if></td>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" style="text-align: center;">
-			<tmpl_if thumbnail>
-				 <a href="<tmpl_var url>"><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var title>" /></a>
-			<tmpl_else>
-				 &nbsp;
-			</tmpl_if>
-		</td>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateUpdated.human></td>
-		<tmpl_if user.isVisitor>
-			<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var username></td>
-		<tmpl_else>
-			<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var userProfile.url>"><tmpl_var username></a></td>
-		</tmpl_if>
-	</tr>
-</tmpl_loop>
-</table>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<br />
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-
-
-~~~
-<style type="text/css">
-.forumHead {
-	background-color: #DADADA;
-	border: 2px solid #cccccc;
-	padding: 2px;
-	padding-bottom: 4px;
-	font-size: 13px;
-	font-weight: bold;
-	font-family:arial;
-}
-
-.oddThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #83cc83;
-	padding-bottom: 4px;	
-	font-family:arial;
-}
-
-.forumHead a
-{
-	color:#29587E;
-}
-
-.oddThread a
-{
-	color:#29587E;
-}
-
-.evenThread a
-{
-	color:#29587E;
-}
-
-.evenThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #aaaaff;
-	padding-bottom: 4px;
-	background-color:#EEEEEE;
-	font-family:arial;
-}
-
-.pagination
-{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-}
-
-.pagination a
-{
-	color:white;
-}
-
-h2
-{
-	font-family:arial;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_unordered_lists.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_unordered_lists.tmpl
deleted file mode 100644
index 83284aa64..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_unordered_lists.tmpl
+++ /dev/null
@@ -1,99 +0,0 @@
-#PBtmpl0000000000000082
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p class="pagination">
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
-		&bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
-		</tmpl_if>
-		&bull;
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
-	</tmpl_if>
-</p>
-
-<ul class="unorderedList">
-	<tmpl_loop post_loop>
-		<li>
-			<tmpl_if user.isPoster>
-				<tmpl_unless session.var.adminOn>
-					[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-				</tmpl_unless>
-			</tmpl_if>
-			<tmpl_if user.isModerator>
-				<tmpl_if session.var.adminOn>
-					<tmpl_var controls>
-				<tmpl_else>
-					<tmpl_unless user.isPoster>
-						<tmpl_unless session.var.adminOn>
-							[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-						</tmpl_unless>
-					</tmpl_unless>
-				</tmpl_if>
-				(<a href="<tmpl_var url>"><tmpl_var status></a>)
-			</tmpl_if>
-			<tmpl_if userDefined1><a href="<tmpl_var userDefined1>"	<tmpl_if userDefined2>target="_blank"</tmpl_if>></tmpl_if><tmpl_var title><tmpl_if userDefined1></a></tmpl_if>
-			<tmpl_if content>
-					  - <tmpl_var content>
-			</tmpl_if>
-		</li>
-	</tmpl_loop>
-</ul>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage>  &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-
-
-~~~
-<style type="text/css">
-.pagination
-{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top:3px;
-}
-
-.pagination a
-{
-	color:white;
-}
-
-.unorderedList
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-h2
-{
-	font-family:arial;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_verticalmenu.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_verticalmenu.tmpl
deleted file mode 100644
index 2695a8419..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_verticalmenu.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-#PBtmpl0000000000000048
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-<tmpl_if session.var.adminOn>
-<tmpl_var controls><br />
-</tmpl_if>
-<span class="verticalMenu">
-<tmpl_loop page_loop>
-<tmpl_var page.indent>
-	<a <tmpl_if page.isCurrent>class="selectedMenuItem"</tmpl_if> <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
-	<br />		
-</tmpl_loop>
-</span>
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
deleted file mode 100644
index a402cdf91..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_weatherdata_default_view.tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-#WeatherDataTmpl0000001
-<a name="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></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>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_webgui6_blank.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_webgui6_blank.tmpl
deleted file mode 100644
index e851e5f70..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_webgui6_blank.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-#PBtmplBlankStyle000001
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>^Page(title); - <tmpl_var session.setting.companyName></title>
-	<link rel="icon" href="^Extras(favicon.png);" type="image/png" />
-	<link rel="shortcut icon" href="^Extras(favicon.ico);" />
-	<tmpl_var head.tags>
-<style type="text/css">
-body {
-	margin: 0;
-	padding: 0;
-}
-</style>
-</head>
-<body>
-^AdminBar("PBtmpl0000000000000090");
-<tmpl_var body.content>
-
-<p>
-^AdminToggle();
-</p>
-</body>
-</html>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_weblog.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_weblog.tmpl
deleted file mode 100644
index 419dabbc1..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_weblog.tmpl
+++ /dev/null
@@ -1,122 +0,0 @@
-#PBtmpl0000000000000112
-<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>
-</tmpl_if>
-
-<p class="pagination">
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&bull;
-	</tmpl_unless>
-	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-</p>
-
-<p />
-
-<tmpl_loop post_loop>
-	<div class="weblogTitleBar">
-		<tmpl_var title>
-	</div>
-	<fieldset class="weblogSynopsis">
-		<legend class="weblogLegend" align="left">
-			<tmpl_var by.label> <a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-			-
-			<tmpl_var dateSubmitted.human>
-			<tmpl_if replies>
-				- <tmpl_var replies> <tmpl_var replies.label>
-			</tmpl_if>
-			<tmpl_if user.isPoster>
-				 - <tmpl_var status>
-			<tmpl_else>
-				<tmpl_if user.isModerator>
-					- <tmpl_var status>
-				</tmpl_if>
-			</tmpl_if>
-		</legend>
-		<tmpl_if thumbnail>
-			<a href="<tmpl_var url>"><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var title>" align="right" /></a>
-		</tmpl_if>
-		<tmpl_var synopsis>
-		<div class="weblogReadMore">
-			<a href="<tmpl_var url>"><tmpl_var readmore.label></a>
-		</div>
-	</fieldset>
-	<p />
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-
-
-~~~
-<style type="text/css">
-.pagination
-{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top:3px;
-}
-
-.pagination a
-{
-	color:white;
-}
-
-.weblogTitleBar {
-	font-weight: bold;
-	font-size: 14px;
-	font-family:arial;
-}
-
-.weblogLegend {
-	font-size: 9px;
-	color: #999999;
-	font-family:arial;
-}
-
-.weblogLegend a
-{
-	color:#29587E;
-}
-
-.weblogReadMore {
-	text-align: right;
-	font-size: 9px;
-	width: 100%;
-	font-family:arial;
-}
-
-.weblogSynopsis {
-	border: 1px solid #bbbbbb;
-	font-size: 13px;
-	padding: 5px;
-	-moz-border-radius: 6px;
-	font-family:arial;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_xmethods_get_temp.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_xmethods_get_temp.tmpl
deleted file mode 100644
index 9aaf62a47..000000000
--- a/docs/upgrades/templates-6.99.0/wgtemplate_xmethods_get_temp.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-#PBtmpl0000000000000069
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<tmpl_if description>
-	<tmpl_var description><br /><br />
-</tmpl_if>
-
-<tmpl_if results>
-	<tmpl_loop results>
-		The current temp is: <tmpl_var result>
-	</tmpl_loop>
-<tmpl_else>
-	Failed to retrieve temp.
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.1/search.tmpl b/docs/upgrades/templates-6.99.1/search.tmpl
deleted file mode 100644
index dae39674d..000000000
--- a/docs/upgrades/templates-6.99.1/search.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-#PBtmpl0000000000000200
-<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>
-  <p><tmpl_var description></p>
-</tmpl_if>
-
-<tmpl_var form_header>
-<tmpl_var form_keywords> <tmpl_var form_submit>
-<tmpl_var form_footer>
-
-<tmpl_if session.form.doit>
-	<tmpl_loop result_set>
-		<dl>
-			<dt><a href="^/;<tmpl_var url>"><tmpl_var title></a></dt>
-			<dd><tmpl_var synopsis></dd>
-		</dl>
-	</tmpl_loop>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination">
-			<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-		</div>
-	</tmpl_if>
-</tmpl_if>
-
diff --git a/docs/upgrades/templates-6.99.1/wgtemplate_bug_tracker_post.tmpl b/docs/upgrades/templates-6.99.1/wgtemplate_bug_tracker_post.tmpl
deleted file mode 100644
index c1c04f7ef..000000000
--- a/docs/upgrades/templates-6.99.1/wgtemplate_bug_tracker_post.tmpl
+++ /dev/null
@@ -1,349 +0,0 @@
-#3OFMIKHCK_NkREwLDGfCjw
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<div class="defaultSubmissionDetails">
-	<b><tmpl_var user.label>:</b> 
-		<tmpl_if user.isVisitor>
-			<tmpl_var username>
-		<tmpl_else>
-			<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-		</tmpl_if>
-		<br />
-	<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-	<b><tmpl_var severity.label>:</b> <tmpl_var userDefined1><br />
-	<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-	<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-		<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-		</tmpl_unless>
-		<br />
-	<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> &nbsp; &nbsp; [ <a href="<tmpl_var unarchive.url>"><tmpl_var open.label></a> <tmpl_else> <tmpl_var open.label> &nbsp; &nbsp; [ <a href="<tmpl_var archive.url>"><tmpl_var close.label></a></tmpl_if> ]<br />
-	<tmpl_else>	
-		<tmpl_if user.isPoster>
-			<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> <tmpl_else> <tmpl_var open.label></tmpl_if><br />
-		</tmpl_if>	
-	</tmpl_if>	
-<tmpl_if karmaIsEnabled>
-	<b><tmpl_var karmaRank.label>:</b> <tmpl_var karmaRank><br />
-<b><tmpl_var transferkarma.label>:</b>
-<tmpl_var transfer.karma.form>
-</tmpl_if>	
-</div>
-
-<div class="collaborationThreadContent">
-<p><b><tmpl_var userDefined2> <tmpl_var userDefined3></b></p>
-	<tmpl_var content>
-</div>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<div style="clear:both;"></div>
-
-<tmpl_if repliesAllowed>
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">	
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>														
-							</td>
-						</tr>
-						</table>
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>														
-							</td>
-						</tr>
-						</table>
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if><br />
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>
-	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a>				
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-	<br />
-</div>
-
-~~~
-<style type="text/css">
-.defaultSubmissionDetails
-{
-	float: right; 		
-	padding: 2px; 
-	margin: 2px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:20px;
-}
-
-.defaultSubmissionDetails a
-{
-	color:#29587E;
-}
-
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	background-color: #eeeeee;
-	padding: 3px;
-}
-.postData td {
-	font-size: 9pt;
-	color: black;
-	font-family:arial;
-}
-.postControls {
-	border-top: 1px solid #cccccc;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-	clear:both;
-	width:100%;
-display:block;
-	-moz-box-sizing:border-box;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.threadData {
-	font-size: 11px;
-	padding: 3px;
-	font-family:arial;
-}
-
-.postControls
-{
-	background:#C0C0C0;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-
-.postControls a
-{
-	color:white;
-}
-
-.collaborationThreadContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.1/wgtemplate_default_forum_notification.tmpl b/docs/upgrades/templates-6.99.1/wgtemplate_default_forum_notification.tmpl
deleted file mode 100644
index 3227b4468..000000000
--- a/docs/upgrades/templates-6.99.1/wgtemplate_default_forum_notification.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-#PBtmpl0000000000000027
-<table border="0" cellpadding="3">
-<tbody>
-<tr>
-	<td><i><tmpl_var notify.subscription.message></i></td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor="#DFDFDF" style="background-color:#DFDFDF;"><a href="<tmpl_var url>"><b><tmpl_var url></a></b></td>
-</tr>
-<tr>
-	<td bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var content></td>
-</tr>
-</tbody>
-</table>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.1/wgtemplate_default_submission.tmpl b/docs/upgrades/templates-6.99.1/wgtemplate_default_submission.tmpl
deleted file mode 100644
index 8020a6fda..000000000
--- a/docs/upgrades/templates-6.99.1/wgtemplate_default_submission.tmpl
+++ /dev/null
@@ -1,346 +0,0 @@
-#PBtmpl0000000000000067
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<div class="defaultSubmissionDetails">
-	<b><tmpl_var user.label>:</b> 
-		<tmpl_if user.isVisitor>
-			<tmpl_var username>
-		<tmpl_else>
-			<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-		</tmpl_if>
-		<br />
-	<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-	<b><tmpl_var severity.label>:</b> <tmpl_var userDefined1><br />
-	<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-	<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-		<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-		</tmpl_unless>
-		<br />
-	<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> &nbsp; &nbsp; [ <a href="<tmpl_var unarchive.url>"><tmpl_var open.label></a> <tmpl_else> <tmpl_var open.label> &nbsp; &nbsp; [ <a href="<tmpl_var archive.url>"><tmpl_var close.label></a></tmpl_if> ]<br />
-	<tmpl_else>	
-		<tmpl_if user.isPoster>
-			<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> <tmpl_else> <tmpl_var open.label></tmpl_if><br />
-		</tmpl_if>	
-	</tmpl_if>	
-<tmpl_if karmaIsEnabled>
-	<b><tmpl_var karmaRank.label>:</b> <tmpl_var karmaRank><br />
-<b><tmpl_var transferkarma.label>:</b>
-<tmpl_var transfer.karma.form>
-</tmpl_if>	
-</div>
-
-<div class="collaborationThreadContent">
-<p><b><tmpl_var userDefined2> <tmpl_var userDefined3></b></p>
-	<tmpl_var content>
-</div>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<div style="clear:both;"></div>
-
-<tmpl_if repliesAllowed>
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">	
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>														
-							</td>
-						</tr>
-						</table>
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>														
-							</td>
-						</tr>
-						</table>
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if><br />
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>
-	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a>				
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-	<br />
-</div>
-~~~
-<style type="text/css">
-.defaultSubmissionDetails
-{
-	float: right; 		
-	padding: 2px; 
-	margin: 2px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:20px;
-}
-
-.defaultSubmissionDetails a
-{
-	color:#29587E;
-}
-
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-}
-.postData td {
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.postControls {
-	border-top: 1px solid #cccccc;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-	clear:both;
-	width:100%;
-display:block;
-	-moz-box-sizing:border-box;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.threadData {
-	font-size: 11px;
-	padding: 3px;
-	font-family:arial;
-}
-
-.postControls
-{
-	background:#C0C0C0;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-
-.postControls a
-{
-	color:white;
-}
-
-.collaborationThreadContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.1/wgtemplate_default_thread.tmpl b/docs/upgrades/templates-6.99.1/wgtemplate_default_thread.tmpl
deleted file mode 100644
index c9fd39f52..000000000
--- a/docs/upgrades/templates-6.99.1/wgtemplate_default_thread.tmpl
+++ /dev/null
@@ -1,232 +0,0 @@
-#PBtmpl0000000000000032
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-	
-<div style="float: left; width: 70%">
-	<h2><a href="<tmpl_var collaboration.url>"><tmpl_var collaboration.title></a></h2>
-</div>
-<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-</div>
-<div style="clear: both;"></div>
-
-<tmpl_if layout.isFlat>
-<!-- begin flat layout -->
-	<tmpl_loop post_loop>
-		<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-			<a name="<tmpl_var assetId>"></a>
-			<div class="postSubject">
-				<tmpl_var title>
-			</div>
-			<div class="postData">
-				<div style="float: left; width: 50%">
-					<b><tmpl_var user.label>:</b> 
-						<tmpl_if user.isVisitor>
-							<tmpl_var username>
-						<tmpl_else>
-							<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-						</tmpl_if>
-						<br />
-					<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-				</div>	
-				<div>
-					<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-					<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-						<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-						</tmpl_unless>
-						<br />
-					<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-					<tmpl_else>	
-						<tmpl_if user.isPoster>
-							<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-						</tmpl_if>	
-					</tmpl_if>	
-				</div>	
-			</div>
-			<div class="postMessage">
-				<tmpl_var content>
-<tmpl_loop attachment_loop>
-	<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-</tmpl_loop>
-<div style="clear: both;"></div>
-
-			</div>
-			<tmpl_unless isLocked>
-				<div class="postControls">
-					<tmpl_if user.canReply>
-						<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull; 
-					</tmpl_if>
-					<tmpl_if user.canEdit>
-						<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
-						<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-					</tmpl_if>
-				</div>
-			</tmpl_unless>
-		</div>
-	</tmpl_loop>
-<!-- end flat layout -->
-</tmpl_if>
-
-<tmpl_if layout.isNested>
-<!-- begin nested layout -->
-	<tmpl_loop post_loop>
-		<div style="margin-left: <tmpl_var depthX10>px;">
-			<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-				<a name="<tmpl_var assetId>"></a>
-				<div class="postSubject">
-					<tmpl_var title>
-				</div>
-				<div class="postData">
-					<div style="float: left; width: 50%">
-						<b><tmpl_var user.label>:</b> 
-							<tmpl_if user.isVisitor>
-								<tmpl_var username>
-							<tmpl_else>
-								<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-							</tmpl_if>
-							<br />
-						<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-					</div>	
-					<div>
-						<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-						<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-							<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-							</tmpl_unless>
-							<br />
-							<tmpl_if user.isPoster>
-								<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-							</tmpl_if>	
-					</div>	
-				</div>
-				<div class="postMessage">
-					<tmpl_var content>
-<tmpl_loop attachment_loop>
-	<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-</tmpl_loop>
-<div style="clear: both;"></div>
-
-				</div>
-				<tmpl_unless isLocked>
-					<div class="postControls">
-						<tmpl_if user.canReply>
-							<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull;
-						</tmpl_if>
-						<tmpl_if user.canEdit>
-							<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
-							<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-						</tmpl_if>
-					</div>
-				</tmpl_unless>
-			</div>
-		</div>
-	</tmpl_loop>
-<!-- end nested layout -->
-</tmpl_if>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination" style="margin-top: 20px;">
-		[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-	</div>
-</tmpl_if>
-
-<div style="margin-top: 20px;" class="bottomControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> &bull;
-	</tmpl_if>	
-	<tmpl_if next.url>
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> &bull; 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a> &bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a> &bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a> &bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a> &bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a> &bull;
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a> &bull;
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-	.postBorder {
-		border: 1px solid #cccccc;
-		margin-bottom: 10px;
-	}
- 	.postBorderCurrent {
-		border: 3px dotted black;
-		margin-bottom: 10px;
-	}
-	.postSubject {
-		border-bottom: 1px solid #cccccc;
-		font-weight: bold;
-		padding: 3px;
-	}
-	.postData {
-		border-bottom: 1px solid #cccccc;
-		font-size: 11px;
-		background-color: #eeeeee;
-		color: black;
-		padding: 3px;
-	}
-	.postControls {
-		border-top: 1px solid #cccccc;
-		background-color: #C0C0C0;
-		color: black;
-		padding: 3px;
-		text-align:right;
-	}
-	.postControls a:visited, .postControls a:link {
-		color:white;
-	}
-	.bottomControls {
-		background-color:#C0C0C0;
-		padding: 3px;
-		text-align:right;
-	}
-	.bottomControls a:link, .bottomControls a:visited {
-		color:white;
-	}	
-	.postMessage {
-		padding: 3px;
-	}
-	.currentThread {
-		background-color: #eeeeee;
-	}
-	.threadHead {
-		font-weight: bold;
-		border-bottom: 1px solid #cccccc;
-		font-size: 11px;
-		background-color: #eeeeee;
-		color: black;
-		padding: 3px;
-	}
-	.threadData {
-		font-size: 11px;
-		padding: 3px;
-	}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.1/wgtemplate_job.tmpl b/docs/upgrades/templates-6.99.1/wgtemplate_job.tmpl
deleted file mode 100644
index a2ad48852..000000000
--- a/docs/upgrades/templates-6.99.1/wgtemplate_job.tmpl
+++ /dev/null
@@ -1,324 +0,0 @@
-#PBtmpl0000000000000098
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<tmpl_if user.isModerator>
-	<div style="float: right; font-size: 11px; border: 1px solid #cccccc; padding: 2px; margin: 2px;">
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	</div>
-</tmpl_if>	
-
-<tmpl_if content>
-	<b>Job Description</b><br />
-	<p><tmpl_var content></p>
-</tmpl_if>
-
-<tmpl_if userDefined3>
-	<b>Job Requirements</b><br />
-	<p><tmpl_var userDefined3></p>
-</tmpl_if>
-
-<table width="100%">
-<tr>
-	<td class="tableHeader">Date Posted</td>
-	<td class="tableData"><tmpl_var dateSubmitted.human>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Location</td>
-	<td class="tableData"><tmpl_var userDefined2>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Compensation</td>
-	<td class="tableData"><tmpl_var userDefined1>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Views</td>
-	<td class="tableData"><tmpl_var views>&#160;</td>
-</tr>
-</table>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<tmpl_if repliesAllowed>
-
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<div style="float: left; width: 50%">
-							<b><tmpl_var user.label>:</b> 
-								<tmpl_if user.isVisitor>
-									<tmpl_var username>
-								<tmpl_else>
-									<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-								</tmpl_if>
-								<br />
-							<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-						</div>	
-						<div>
-							<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-							<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<tmpl_if user.isPoster>
-									<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-								</tmpl_if>	
-						</div>	
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-							<div style="float: left; width: 50%">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-							</div>	
-							<div>
-								<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-									<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-									</tmpl_unless>
-									<br />
-									<tmpl_if user.isPoster>
-										<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-									</tmpl_if>	
-							</div>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>			
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-	font-size:9pt;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.postControls
-{
-	background:#C0C0C0;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-.postControls a:link, .postControls a:visited
-{
-	color:white;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.threadData {
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-
-.tableHeader
-{
-	width:20%;
-	background-color:#DADADA;
-	font-family:arial;
-	font-size:9pt;	
-}
-
-.tableData
-{
-	width:80%;
-	border:solid #DADADA 1px;
-	font-family:arial;
-	font-size:9pt;	
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.1/wgtemplate_link.tmpl b/docs/upgrades/templates-6.99.1/wgtemplate_link.tmpl
deleted file mode 100644
index 15bf17549..000000000
--- a/docs/upgrades/templates-6.99.1/wgtemplate_link.tmpl
+++ /dev/null
@@ -1,307 +0,0 @@
-#PBtmpl0000000000000113
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<tmpl_if user.isModerator>
-	<div style="float: right; font-size: 11px; border: 1px solid #cccccc; padding: 2px; margin: 2px;">
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	</div>
-</tmpl_if>	
-
-<tmpl_if content>
-	<div class="linkContent">
-	<b>Link Description</b><br /><br />
-	<tmpl_var content><br />
-	
-	<b>Link URL</b><br /><br />
-	<a href="<tmpl_var userDefined1>"><tmpl_var userDefined1></a><br /><br />
-	</div>
-</tmpl_if>
-
-
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<tmpl_if repliesAllowed>
-
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<div style="float: left; width: 50%">
-							<b><tmpl_var user.label>:</b> 
-								<tmpl_if user.isVisitor>
-									<tmpl_var username>
-								<tmpl_else>
-									<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-								</tmpl_if>
-								<br />
-							<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-						</div>	
-						<div>
-							<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-							<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<tmpl_if user.isPoster>
-									<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-								</tmpl_if>	
-						</div>	
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull; 
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-							<div style="float: left; width: 50%">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-							</div>	
-							<div>
-								<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-									<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-									</tmpl_unless>
-									<br />
-									<tmpl_if user.isPoster>
-										<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-									</tmpl_if>	
-							</div>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>">List All Links</a>
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		&bull;
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.postControls
-{
-	background:#C0C0C0;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-.postControls a:link, .postControls a:visited
-{
-	color:white;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.threadData {
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-
-.linkContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-.linkContent a
-{
-	color:#29587E;
-}
-
-
-h2
-{
-	font-family:arial;
-}
-
-
-</style>
-
-
diff --git a/docs/upgrades/templates-6.99.2/article_with_files.tmpl b/docs/upgrades/templates-6.99.2/article_with_files.tmpl
deleted file mode 100755
index fd88828a5..000000000
--- a/docs/upgrades/templates-6.99.2/article_with_files.tmpl
+++ /dev/null
@@ -1,52 +0,0 @@
-#PBtmpl0000000000000207
-<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 pagination.isFirstPage>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<tmpl_if pagination.isLastPage>
-	<tmpl_if linkUrl>
-	<tmpl_if linkTitle>
-		<p />
-		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
-	</tmpl_if>
-	</tmpl_if>
-	<tmpl_loop attachment_loop>
-		<p style="display:inline;vertical-align:middle;"><a href="<tmpl_var url>"><img src="<tmpl_var icon>" style="vertical-align:middle;border: 0px;" alt="<tmpl_var filename>" /> <tmpl_var filename></a></p><br />
-	</tmpl_loop>
-</tmpl_if>
-
-<tmpl_if pagination.pageCount.isMultiple>
-<tmpl_var pagination.previousPage>
-&#183;
-<tmpl_var pagination.pageList.upTo20>
-&#183;
-<tmpl_var pagination.nextPage>
-</tmpl_if>
-
-<tmpl_if pagination.isFirstPage>
-</tmpl_if>
-
-<tmpl_if pagination.isLastPage>
-<tmpl_if allowDiscussion>
-	<p>
-	<table width="100%" cellspacing="2" cellpadding="1" border="0">
-	<tr>
-	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
-	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td>
-	</tr>
-	</table>
-</tmpl_if>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.2/loginbox1.tmpl b/docs/upgrades/templates-6.99.2/loginbox1.tmpl
deleted file mode 100644
index f05ba09ea..000000000
--- a/docs/upgrades/templates-6.99.2/loginbox1.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-#PBtmpl0000000000000044
-<div class="loginBox">
-<tmpl_if user.isVisitor>
-	<tmpl_var form.header>
-             <label for="username_formId"><tmpl_var username.label></label><br />
-             <tmpl_var username.form><br />
-             <label for="identifier_formId"><tmpl_var password.label></label><br />
-             <tmpl_var password.form><br />
-             <tmpl_var form.login>
-	<tmpl_var form.footer>
-	<tmpl_if session.setting.anonymousRegistration>
-                        <p><a href="<tmpl_var account.create.url>"><tmpl_var account.create.label></a></p>
-	</tmpl_if>	
-<tmpl_else>
-	<tmpl_unless customText>
-		<tmpl_var hello.label> <a href="<tmpl_var account.display.url>"><tmpl_var session.user.username></a>.
-                          <a href="<tmpl_var logout.url>"><tmpl_var logout.label></a>
-	<tmpl_else>
-		<tmpl_var customText>
-	</tmpl_unless>
-</tmpl_if>
-</div>
-
diff --git a/docs/upgrades/templates-6.99.2/loginbox2.tmpl b/docs/upgrades/templates-6.99.2/loginbox2.tmpl
deleted file mode 100644
index f40e1830b..000000000
--- a/docs/upgrades/templates-6.99.2/loginbox2.tmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-#PBtmpl0000000000000092
-<div class="loginBox">
-<tmpl_if user.isVisitor>
-	<tmpl_var form.header>
-	<table border="0" cellpadding="1" cellspacing="0">
-	<tr>
-		<td><tmpl_var username.form></td>
-		<td><tmpl_var password.form></td>
-		<td><tmpl_var form.login></td>
-	</tr>
-	<tr>
-		<td><label for="username_formId"><tmpl_var username.label></label></td>
-		<td><label for="identifier_formId"><tmpl_var password.label></label></td>
-		<td></td>
-	</tr>
-	</table>             	<tmpl_if session.setting.anonymousRegistration>
-                        <a href="<tmpl_var account.create.url>"><tmpl_var account.create.label></a>
-	</tmpl_if>		<tmpl_var form.footer> 
-<tmpl_else>
-	<tmpl_unless customText>
-		<tmpl_var hello.label> <a href="<tmpl_var account.display.url>"><tmpl_var session.user.username></a>.
-                          <a href="<tmpl_var logout.url>"><tmpl_var logout.label></a>
-	<tmpl_else>
-		<br /><tmpl_var customText>
-	</tmpl_unless>
-</tmpl_if>
-</div>
-
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_bulleted_list.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_bulleted_list.tmpl
deleted file mode 100644
index 00831072a..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_bulleted_list.tmpl
+++ /dev/null
@@ -1,58 +0,0 @@
-#PBnav00000000000bullet
-#create
-#title:Bulleted List
-#menuTitle:Bulleted List
-#url:bulleted_list
-#namespace:Navigation
-<tmpl_if session.var.adminOn>
-<tmpl_var controls><br />
-</tmpl_if>
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<tmpl_loop page_loop>
-<tmpl_if __FIRST__>
-	<ul class="bulletList">
-</tmpl_if>
-
-
-<tmpl_loop page.depthDiff_loop>
-   </ul></li>
-</tmpl_loop>
-
-<li class="level<tmpl_var page.relDepth>"><a <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
-<tmpl_if page.hasViewableChildren>
-	<ul>
-<tmpl_else>
-	</li>
-</tmpl_if>
-
-<tmpl_if __LAST__> 
-	<tmpl_loop page.indent_loop>
-		<tmpl_unless __first__></li></tmpl_unless>
-       		</ul>
- 	</tmpl_loop>
-	</li></ul>
-</tmpl_if>
-</tmpl_loop>
-~~~
-<style type="text/css">
-ul.bulletList li, ul.bulletList ul {
-	margin-left:7px;
-	padding-left:0px;
-	font-size:9px;	
-}
-
-.bulletList .level0 {
-	font-size:13px;
-}
-
-.bulletList .level1 {
-	font-size:11px;
-}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_default_email.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_default_email.tmpl
deleted file mode 100644
index 48225f8a0..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_default_email.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-#PBtmpl0000000000000085
-<br /><br />
-<tmpl_loop field_loop>
-<table cellpadding="3" cellspacing="2" border="0" width="80%">
-	<tmpl_unless field.isMailField>
-	<tr>
-		<td width="23%" align="right" bgcolor="#DFDFDF" style="background-color:#DFDFDF;"><b><tmpl_var field.label> :</b></td>		
-		<td width="75%" bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var field.value></td>
-	</tr>
-	</tmpl_unless>
-</table>
-</tmpl_loop>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_default_forum_notification.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_default_forum_notification.tmpl
deleted file mode 100644
index 91572eaed..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_default_forum_notification.tmpl
+++ /dev/null
@@ -1,54 +0,0 @@
-#PBtmpl0000000000000027
-<table border="0" cellpadding="3" cellspacing="2">
-<tbody>
-<tr>
-	<td colspan="2"><i><tmpl_var notify.subscription.message></i></td>
-</tr>
-<tr>
-	<td colspan="2">&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="2" bgcolor="black" style="background-color:black;"><font color="white"><b style="color:white;"><tmpl_var username> replied to the thread, '<tmpl_var title>'</b></font></td>
-</tr>
-<tr>
-	<td colspan="2" bgcolor="#DFDFDF" style="background-color:#DFDFDF;"><a href="<tmpl_var url>"><b style="color:#ACACAC;"><font color="#ACACAC"><tmpl_var url></font></a></b></td>
-</tr>
-<tr>
-	<td colspan="2" bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var content></td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tmpl_if userDefined1>
-<tr>
-	<td width="25%" bgcolor="#DFDFDF" style="background-color:#DFDFDF;">User Defined 1:</td>
-	<td width="75%" bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var userDefined1></td>
-</tr>
-</tmpl_if>
-<tmpl_if userDefined2>
-<tr>
-	<td width="25%" bgcolor="#DFDFDF" style="background-color:#DFDFDF;">User Defined 2:</td>
-	<td width="75%" bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var userDefined2></td>
-</tr>
-</tmpl_if>
-<tmpl_if userDefined3>
-<tr>
-	<td width="25%" bgcolor="#DFDFDF" style="background-color:#DFDFDF;">User Defined 3:</td>
-	<td width="75%" bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var userDefined3></td>
-</tr>
-</tmpl_if>
-<tmpl_if userDefined4>
-<tr>
-	<td width="25%" bgcolor="#DFDFDF" style="background-color:#DFDFDF;">User Defined 4:</td>
-	<td width="75%" bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var userDefined4></td>
-</tr>
-</tmpl_if>
-<tmpl_if userDefined5>
-<tr>
-	<td width="25%" bgcolor="#DFDFDF" style="background-color:#DFDFDF;">User Defined 5:</td>
-	<td width="75%" bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var userDefined5></td>
-</tr>
-</tmpl_if>
-</tbody>
-</table>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_default_pm_project_display.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_default_pm_project_display.tmpl
deleted file mode 100644
index 53b55f757..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_default_pm_project_display.tmpl
+++ /dev/null
@@ -1,668 +0,0 @@
-#ProjectManagerTMPL0002
-<script>
-	var JScolresize="1";
-	var JScolmove="1";
-	var JScolhide="1";
-	var filtered =0;
-	var sortable = new Array (0,0,0,0,0,0);
-	var filterable = new Array (0,0,0,0,0,0);
-	
-	function init(tableName) {
-	   sortableInit(tableName);
-	}
-</script>
-
-<script type="text/javascript">
-    var dayMS = 86400000;
-	
-	var popTitle = "Add/Edit Task";
-	
-	var dunits = "<tmpl_var project.durationUnits>";
-	var hoursPerDay = <tmpl_var project.hoursPerDay>;
-	var taskLength=<tmpl_var project.task.length>;
-	
-   //--------------------------------------------------------------------------------------	
-	function doCalendar (fieldId) {
-	   Calendar.setup({ 
-                         inputField : fieldId, 
-                         ifFormat : "%Y-%m-%d", 
-                         showsTime : false, 
-                         step : 1,
-                         timeFormat : "12",
-                         firstDay : false
-                    }); 
-    }
-	
-   //--------------------------------------------------------------------------------------	
-    function buildMenuUrl (urltype,taskId) {
-       if(urltype == "edit") {
-	      alert("edit task: "+taskId);
-	   } else if(urltype == "insertAbove") {
-	      alert("insert task above: "+taskId);
-	   } else if(urltype == "insertBelow") {
-	      alert("insert task below: "+taskId);
-	   } else if(urltype == "delete") {
-	      alert("delete task: "+taskId);
-	   }
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function closeImage() {
-       return '<tmpl_var extras>/close.gif';
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function configureMilestone(box) {
-	   var form = box.form;
-	   if(box.checked==true) { 
-	      form.end.value=form.start.value; 
-		  form.duration.value=0; 
-		  form.duration.disabled=true; 
-		  form.end.disabled=true;
-		  form.dependants.disabled=true;
-		  form.resource.disabled=true;
-		  form.percentComplete.disabled=true;
-		  form.percentComplete.value=0;
-	   } else { 
-	      form.end.disabled=false; 
-		  form.duration.disabled=false; 
-		  form.dependants.disabled=false;
-		  form.resource.disabled=false;
-		  form.percentComplete.disabled=false;
-		  form.duration.value = (dunits == "hrs")?hoursPerDay:1;
-	   }
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function checkEditTaskForm (form) {
-	   if(form.name.value == "") {
-	      alert("<tmpl_var form.name.error>");
-		  return;
-	   } else if(form.start.value == "") {
-	      alert("<tmpl_var form.start.error>");
-		  return;
-	   } else if(form.milestone.checked==false && form.end.value == "") {
-	      alert("<tmpl_var form.end.error>");
-		  return;
-	   }
-	   form.submit();
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function intlDate(dateObj) {
-	   return dateObj.getFullYear()+"-"+pad((dateObj.getMonth()+1))+"-"+pad(dateObj.getDate());
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function toDateObj(date) {
-	   var to = date.split("-");
-	   var dateObj = new Date(to[0],(to[1]-1),to[2],0,0,1,0);
-	   return dateObj;
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function adjustTaskTimeFromDuration(start, end, duration, isTaskForm, predecessor, origStart, origEnd, seqNum) {
-	   //set the form element
-	   var form = duration.form;
-	   
-	   //get today's date
-	   var today = new Date();
-	   var todayIntl = intlDate(today);
-	   //set start and end date if not already set
-	   if(start.value == "") start.value = todayIntl;
-	   if(end.value == "") end.value = todayIntl;
-	   	   
-	   //Convert predecessor hours to days
-	   var taskDuration = duration.value;
-	   if(dunits == "hrs") taskDuration = taskDuration / hoursPerDay;
-	   var durationFloor = Math.floor(taskDuration);
-	   
-	   //Handle task form and main form seperately due to differences in the forms
-	   if(isTaskForm && taskDuration <= 0) {
-	      //Convert to milestone if task is less or equal to zero
-	      if(confirm("Zero duration tasks are considered Milestones.  Do you wish to change this task to a milestone?")) {
-		     form.milestone.checked = true;
-			 configureMilestone(form.milestone);
-		  } else {
-			 duration.value = form.orig_duration.value;
-	      }
-		  return;
-	   } else if (taskDuration <= 0){
-	      //Do not let users zero out tasks
-		  alert("Zero duration tasks are considered Milestones.  Please edit the task by clicking the link if you wish to change this task to a milestone");
-		  return;
-	   }
-	   
-	   //create the start date 
-	   var aTo = start.value.split("-");
-	   var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-       
-	   //add new duration days to the start date
-       toDate.setDate(toDate.getDate() + durationFloor);
-			  
-	   //set end date to this date
-	   end.value = intlDate(toDate);
-	   
-	   //Set new duration in taskArray
-	   taskArray[seqNum]["duration"] = duration.value;
-	   //Adjust time based on new end date
-	   adjustTaskTimeFromDate(start, end, duration, end, isTaskForm, predecessor, origStart, origEnd, seqNum);
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function adjustTaskTimeFromDate (start, end, duration, element, isTaskForm, predecessor, origStart, origEnd, seqNum) {
-	   //set the form element
-	   var form = element.form;
-	   //set original duration from task form to determine whether or not to continue to set duration
-	   var orig_duration;
-	   
-	   if(isTaskForm) {
-	      if(form.milestone.checked == true) return;
-          orig_duration = form.orig_duration.value;
-	   }
-	   
-	   //Handle case where both start and end are empty
-	   if(start.value == "" && end.value == "") {
-	      //get today's date
-	      var today = new Date();
-	      var todayIntl = intlDate(today);
-	      //set start and end date if not already set
-		  start.value = todayIntl;
-		  end.value = todayIntl;
-	   }
-	   
-	   //Handle case where one is set and the other isn't
-	   if (end.value == "") end.value = start.value;
-	   if(start.value == "") start.value = end.value;
-	   
-	   if(isTaskForm && orig_duration == "") {
-	      //Set duration if this is a new record
-		  //Check to make sure start date comes before end date
-		  var startcomp = start.value.replace(/-/g,"");
-	      var endcomp = end.value.replace(/-/g,"");
-	      if(startcomp > endcomp) {
-	         alert("<tmpl_var form.greaterthan.error>");
-		     if(element.name == "start") {
-		        end.value = element.value;
-		     } else {
-		        start.value = element.value;
-		     }
-		     duration.value = (dunits == "hrs")?hoursPerDay:1;
-		     return;
-	      }
-	   
-	      var d = getDaysInterval(start.value,end.value);
-		  if(d == 0) d = 1;
-	      if(dunits == "hrs") {
-	         d = d * hoursPerDay;
-	      }
-	      duration.value = d;
-	   } else {
-	      //Set start/end if duration has been saved
-		  var d = duration.value; 
-		  if(dunits == "hrs") {
-		     //Convert to days
-		     d = d / hoursPerDay;
-		  }
-	      //Round off duration or set it to zero if less than 1;
-		  //alert("d = " + d + " floor = " + Math.floor(d));
-		  if(d < 1) d = 0;
-		  else d = Math.floor(d);
-		  
-		  if(element.name.indexOf("start") > -1) {
-		     //create the date 
-			  var aTo = start.value.split("-");
-			  var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-             //add duration days to the start date
-              toDate.setDate(toDate.getDate() + d);
-			  //set end date to this date
-			  end.value = intlDate(toDate);
-		  } else if(element.name.indexOf("end") > -1) {
-		      //create the date
-			  var aFrom = end.value.split("-");
-			  var fromDate = new Date(aFrom[0],(aFrom[1]-1),aFrom[2],0,0,1,0);
-			  //subtract duration days from the end date
-			  fromDate.setDate(fromDate.getDate() - d);
-			  //set start date to this date
-			  start.value = intlDate(fromDate);
-		  }
-	   }
-	   
-	   //Check Predecessors before moving stuff
-	   var pred = predecessor.value;
-	   if(pred != "") {
-		  //Check to make sure that the dependency requirement for this task is still valid
-		  //Get the predecessor end date
-	      var taskStart = toDateObj(start.value);
-		  var predTaskEnd;
-		  if(isTaskForm) {
-		     predTaskEnd = toDateObj(taskArray[pred]["end"]);
-		  } else {
-		     var predTaskEndId = "end_"+taskArray[pred]["id"]+"_formId"
-		     predTaskEnd = toDateObj(document.getElementById(predTaskEndId).value);
-		  }
-		  
-		  if(taskStart.getTime() < predTaskEnd.getTime()) {
-		     alert("<tmpl_var form.invalidMove.error>");
-			 start.value = origStart.value;
-			 end.value = origEnd.value;
-			 return;
-		  }
-	   }
-	   
-	   //Check all tasks past this one and move them forward if necessary (this only needs to happen on the main form)
-	   if(!isTaskForm) {
-	      arrangePredecessors(element,seqNum);
-	   }
-	   //reset orig start and end values
-	   origStart.value = start.value;
-	   origEnd.value = end.value;
-	   
-	   if(!isTaskForm) {
-	      //Adjust task form for 
-	      paintGanttChart();
-	   }
-	}
-   
-   //--------------------------------------------------------------------------------------
-   function trim(str) {
-      return str.replace(/^\s+|\s+$/, '');
-   }
-	
-   //--------------------------------------------------------------------------------------
-   function arrangePredecessors (element,seqNum) {
-	  for (var i = 1; i <= taskLength; i++) {
-	     var seq = i;
-		 var task = taskArray[seq];
-		 var taskId = task["id"];
-		 //Calculate duration and duraiton floor
-		 var durationInDays = parseFloat(task["duration"]);
-		 if(dunits == "hrs") durationInDays = durationInDays / hoursPerDay;
-		 var durationFloor = Math.floor(durationInDays);
-		 //alert("Duration Floor is: "+durationFloor);
-		 //Get the current elements
-		 var currElementStart = document.getElementById("start_"+taskId+"_formId");
-	     var currElementEnd = document.getElementById("end_"+taskId+"_formId");
-		 //alert("Current Start Date: "+currElementStart.value+"   Current End Date: "+currElementEnd.value);
-		 //Skip the first record as it is the record that was changed
-		 if(seq > 1) {
-		    var predecessor = task["predecessor"];
-			//alert("predecessor for "+i+" is "+predecessor);
-			if(predecessor != "") {
-			   var pred = taskArray[predecessor];
-			   var predEndDate = toDateObj(pred["end"]);
-			   var startDate = toDateObj(task["start"]);
-			   //alert ("Pred End Date: "+intlDate(predEndDate));
-			   //Make sure start date of this task is greater than the end date of the predecessor
-			   if(startDate.getTime() <= predEndDate.getTime()) {
-			      //Change the start and end dates of the task
-				  //Get the day part of the predecessor
-				  var predDayPart = parseFloat(pred["dayPart"]);
-				  //alert("predDayPart: "+predDayPart);
-				  if(predDayPart > 0) {
-				     //The previous task took up part of a day.  Add the additional day part to the duration
-					 durationInDays += predDayPart;
-					 durationFloor = Math.floor(durationInDays);
-				  }
-				  //alert("Duration in Days: "+durationInDays+" Duration Floor: "+durationFloor);
-				  //Set the start date of this task to the end date of the predecessor
-				  currElementStart.value = pred["end"];
-				  //Adjust end date for change in start date and update the object - start date is actually predEndDate now, so use the existing date object
-				  predEndDate.setDate(predEndDate.getDate() + durationFloor);
-				  currElementEnd.value = intlDate(predEndDate);
-				 //alert("Set seq "+i+" to start: "+pred["end"]+" end: "+intlDate(predEndDate));
-			   }
-			}
-		 }
-		  
-		 //Update task array with new start/end values
-		 taskArray[seq]["start"] = currElementStart.value;
-		 taskArray[seq]["end"] = currElementEnd.value;
-		 taskArray[seq]["dayPart"] = (durationInDays - Math.floor(durationInDays));
-	  }
-   }
-	
-   //--------------------------------------------------------------------------------------	
-	function getDaysInterval(from,to) {
-       var aFrom = from.split("-");
-	   var aTo = to.split("-");
-	   var fromDate = new Date(aFrom[0],(aFrom[1]-1),aFrom[2],0,0,1,0);
-	   var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-	   var fromEpoch = fromDate.getTime();
-	   var toEpoch = toDate.getTime();
-	  
-	   var seconds = toEpoch - fromEpoch;
-	   if(seconds == 0) return 0;
-	   return (seconds/dayMS);
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function pad(date) {
-       var str = ""+date;
-       if(str.length == 1) {
-	      str = "0"+str;
-	   }
-	   return str;
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function paintGanttChart () {
-	   var status = AjaxRequest.submit(document.forms['editAll'],{
-                                      'onSuccess':function(req){ document.getElementById('gantt').innerHTML = req.responseText; }
-                                     });
-       
-	   var mwidth = document.getElementById("projectTableWidth").name + "px";
-	   var swidth = document.getElementById("projectScrollPercentWidth").name + "%";
-	   document.getElementById("mastertable").style.width=mwidth;
-	   document.getElementById("scrolltd").style.width=swidth;
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function validateDependant(field,origField,seqNum,start,end,duration,isTaskForm,origStart,origEnd) {
-	   var pred = field.value;
-	   var newTask = false;
-	   if(pred != "") {
-	      if(seqNum == "") seqNum = taskLength+1;
-		  if(pred < 1) {
-	         alert("<tmpl_var form.noPredecessor.error>");
-		     field.value=origField.value;
-		     return;
-	      }
-	      if(pred == seqNum) {
-	         alert("<tmpl_var form.samePredecessor.error>");
-		     field.value=origField.value;
-		     return;
-	      }
-	      if(pred > seqNum) {
-	         alert("<tmpl_var form.previousPredecessor.error>");
-		     field.value = origField.value;
-		     return; 
-	      }
-		  
-	      //Set defaults if it's a new record and one of the other options hasn't been checked.
-	      if(start.value == "" || end.value == "") {
-             //get today's date
-			 newTask = true;
-			 duration.value = (dunits == "hrs")?hoursPerDay:1; 
-		  }
-	      //Get the predecessor end date and decide where the new start date belongs
-	      var taskStart = start.value;
-		  var taskStartObj = toDateObj(taskStart);
-		  var predTaskEnd = taskArray[pred]["end"];
-		  var predTaskEndObj = toDateObj(predTaskEnd);
-		  
-		  //Change start date if it comes before predecessor end date
-		  if(newTask || (taskStartObj.getTime() < predTaskEndObj.getTime())) {
-		     
-			 //Convert predecessor hours to days
-	         var taskDuration = duration.value;
-			 if(dunits == "hrs") taskDuration = taskDuration / hoursPerDay;
-			 var durationFloor = Math.floor(taskDuration);
-			 
-			 //Get the predecessor dayPart
-			 var predDayPart = parseFloat(pred["dayPart"]);
-		     if(predDayPart > 0) {
-		        //The previous task took up part of a day.  Add the additional day part to the duration
-			    taskDuration += predDayPart;
-				durationFloor = Math.floor(durationInDays);
-			 }
-	         
-			 //Set the start date of this task to the end date of the predecessor
-		     start.value = predTaskEnd;
-			 //Adjust end date for change in start date
-	         adjustTaskTimeFromDate(start,end,duration,start,isTaskForm,field,origStart,origEnd,seqNum);
-			 return;
-		  }
-	   }
-	   
-	   //Repaint
-	   if(!isTaskForm) {
-	      //Set new predecessor in taskArray
-	      taskArray[seqNum]["predecessor"] = pred;
-	      paintGanttChart();
-	   }
-	}
-   
-    addEvent(window, "load", initPopUp);
-</script>
-<tmpl_var form.header>
-<table cellpadding="0" cellspacing="0" border="0" class="project" id="mastertable" style="width:<tmpl_var project.table.width>px;">
-   <tbody>
-      <tr>
-         <td style="width:20px;height:20px;">&nbsp;</td>
-	     <td style="width:300px;" align="center">Task Name</td>
-	     <td style="width:70px;" align="center">Duration</td>
-	     <td style="width:70px;" align="center">Start</td>
-	     <td style="width:70px;" align="center">Finish</td>
-	     <td style="width:30px;" align="center">Pred</td>
-	     <td rowspan="<tmpl_var project.gaant.rowspan>" valign="top" id="scrolltd" style="border-style:none;width:<tmpl_var project.scroll.percentWidth>%;">
-	        <div class="scroller" id="gantt">
-			   <tmpl_var project.ganttChart>
-		    </div>
-	     </td>
-      </tr>
-      <tr>
-	     <td colspan="6">&nbsp;</td>
-      </tr>
-      <tmpl_loop task.loop>
-      <tr id="<tmpl_var task.row.id>">
-	     <td align="center" style="height:20px"><tmpl_var task.number></td>
-	     <td align="left" style="height:20px">
-	        <tmpl_if task.canAdd>
-		       <a href="<tmpl_var task.edit.url>" class="submodal"><tmpl_var task.name></a>
-		    <tmpl_else>
-		       <tmpl_var task.name>
-		    </tmpl_if>
-	     </td>
-	     <td align="center" style="height:20px"><tmpl_var task.duration> <tmpl_var task.duration.units></td>
-	     <td align="center" style="height:20px"><tmpl_var task.start></td>
-	     <td align="center" style="height:20px"><tmpl_var task.end></td>
-	     <td align="center" style="height:20px"><tmpl_var task.dependants></td>	
-      </tr>
-      </tmpl_loop>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-   </tbody>
-</table>
-<tmpl_var form.footer>
-
-<div id="links">
-<!-- 	<tmpl_if project.canEdit><a href="<tmpl_var task.resources.url>"><tmpl_var task.resources.label></a>&nbsp;|&nbsp;</tmpl_if> -->
-	<tmpl_if task.canAdd><a href="<tmpl_var task.add.url>" class="submodal"><tmpl_var task.add.label></a>&nbsp;|&nbsp;</tmpl_if>
-	<a href="<tmpl_var task.back.url>"><tmpl_var task.back.label></a>
-</div>
-<script type="text/javascript">
-	init("mastertable");
-</script>
-
-~~~
-<style type="text/css">
-	body, html {
-		margin:0px;
-		padding:0px;
-	}
-	.project {
-		position:relative;
-		margin-top:5px;
-		margin-left:5px;
-	}
-	.project td {
-		border:solid silver 1px;
-		border-bottom:solid gray 1px;
-		font-size:9pt;
-		font-family:arial;		
-	}
-	.project a {
-	    color:#000000;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.project a:hover {
-	    color:#7AB7E9;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.taskname {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 295px;
-    }
-	.taskduration {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 25px;
-	}
-	.taskdate {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 68px;
-	}
-	.taskdependant {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 20px;
-	}
-	tr.monthNames td {		
-		text-align:center;		
-	}
-	tr.dates td {
-		width:16px;
-	}
-	div.scroller {		
-		overflow:scroll;		
-		position:relative;
-		width:400px;		
-	}
-	
-	* html div.scroller {
-		overflow-x:scroll;
-	}
-	
-	td.empty {
-		background-color:transparent;
-		border-style:none;
-		height:20px;
-	}
-	
-	div.barPositions {
-		position:relative;
-	}
-	div.projectBar {
-		background-color:#7AB7E9;
-		position:absolute;
-		height:10px;
-		z-index:2;
-		padding:0px;
-		margin:0px;
-		font-size:1pt;
-	}
-	div.statusBar {	
-		background-color:#000;
-		position:absolute;	
-		height:5px;
-		z-index:3;
-		padding:0px;
-		top:2px;
-		margin:0px;		
-		font-size:1pt;		
-	}
-	
-	div.projectLineH {		
-		background: url('images/dot.gif') top repeat-x;		
-		font-size:1pt;
-		text-align:right;
-		position:absolute;
-	}		
-	div.projectLineV {
-		width:1px;
-		background-color:black;
-		position:relative;
-		font-size:1pt;	
-		height:100%;
-		float:right;
-	}
-	
-	div.projectLabel {
-		position:absolute;
-		margin-top:-3px;
-		white-space:nowrap;
-		font-family: verdana;
-		font-size:8px;
-	}
-	
-	div.milestone {
-		color:#000000;
-		position:absolute;
-		z-index:4;
-		margin:0px;
-		padding:0px;		
-		margin-top:-3px;
-		font-size: 10px;
-		font-family: times;
-	}
-	
-	#links {
-		margin-top:7px;
-		margin-left:5px;
-		font-family:arial;
-		font-size:9pt;
-	}
-	
-	#links a {
-		color:#7AB7E9;
-	}
-</style>
-
-<style>
-.popUp {
-			width:100%;
-			border:solid black 0px;
-			background-color:#F5F5F5;
-		}
-		.popUp td {
-			font-size:9pt;	
-			font-family:arial;
-			border-top:solid #E0E0E0 1px;
-		}	
-		.popUp tr.clear td {
-			border-style:none;
-			background-color:#F0F0F0;
-		}
-		.popUp tr.clearNoBG td {
-			border-style:none;
-		}
-		.popUp td.header {
-			font-weight:bold;
-		}
-		a.saveBtn {
-			width:40px;
-			height:15px;
-			background-color:silver;
-			padding:1px;
-			padding-left:5px;
-			padding-right:5px;
-			color:white;
-			border:solid gray 1px;
-			text-decoration:none;
-			font-weight:bold;
-			display:block;
-			float:right;
-			text-align:center;
-		}
-		a.saveBtn:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-</style>
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_default_submission.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_default_submission.tmpl
deleted file mode 100644
index dfa807a65..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_default_submission.tmpl
+++ /dev/null
@@ -1,348 +0,0 @@
-#PBtmpl0000000000000067
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<div class="defaultSubmissionDetails">
-	<b><tmpl_var user.label>:</b> 
-		<tmpl_if user.isVisitor>
-			<tmpl_var username>
-		<tmpl_else>
-			<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-		</tmpl_if>
-		<br />
-	<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-	
-	<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-	<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-		<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-		</tmpl_unless>
-		<br />
-	<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> &nbsp; &nbsp; [ <a href="<tmpl_var unarchive.url>"><tmpl_var open.label></a> <tmpl_else> <tmpl_var open.label> &nbsp; &nbsp; [ <a href="<tmpl_var archive.url>"><tmpl_var close.label></a></tmpl_if> ]<br />
-	<tmpl_else>	
-		<tmpl_if user.isPoster>
-			<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> <tmpl_else> <tmpl_var open.label></tmpl_if><br />
-		</tmpl_if>	
-	</tmpl_if>	
-<tmpl_if karmaIsEnabled>
-	<b><tmpl_var karmaRank.label>:</b> <tmpl_var karmaRank><br />
-<b><tmpl_var transferkarma.label>:</b>
-<tmpl_var transfer.karma.form>
-</tmpl_if>	
-</div>
-
-<div class="collaborationThreadContent">
-<p><b><tmpl_var userDefined2> <tmpl_var userDefined3></b></p>
-	<tmpl_var content>
-</div>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<div style="clear:both;"></div>
-
-<tmpl_if repliesAllowed>
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">	
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>														
-							</td>
-						</tr>
-						</table>
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>														
-							</td>
-						</tr>
-						</table>
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if><br />
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>
-	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a>				
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-	<br />
-</div>
-~~~
-<style type="text/css">
-.defaultSubmissionDetails
-{
-	float: right; 		
-	padding: 2px; 
-	margin: 2px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:20px;
-}
-
-.defaultSubmissionDetails a
-{
-	color:#29587E;
-}
-
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	background-color: #eeeeee;
-	padding: 3px;
-}
-.postData td {
-	font-size: 9pt;
-	color: black;
-	font-family:arial;
-}
-.postControls {
-	border-top: 1px solid #cccccc;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-	clear:both;
-	width:100%;
-display:block;
-	-moz-box-sizing:border-box;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.threadData {
-	font-size: 11px;
-	padding: 3px;
-	font-family:arial;
-}
-
-.postControls
-{
-	background:#C0C0C0;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-
-.postControls a:link, .postControls a:visited
-{
-	color:white;
-}
-
-.collaborationThreadContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_default_tt_row.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_default_tt_row.tmpl
deleted file mode 100644
index f7670e953..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_default_tt_row.tmpl
+++ /dev/null
@@ -1,68 +0,0 @@
-#TimeTrackingTMPL000003
-
-<table class="timeTracking02" cellpadding="3" cellspacing="0">
-<tbody id="ttbody">
-   <tr class="tt_title" id="tt_title">
-      <td colspan="4" align="left"><tmpl_var time.report.header></td>
-	  <td colspan="2" align="right"><tmpl_var time.report.hours.label> <strong style="color:red;" id="totalHours">0</strong></td>
-   </tr>
-   <tr class="tt_header" id="tt_header">
-      <td width="10%"><tmpl_var time.report.date.label></td>
-	  <td width="20%"><tmpl_var time.report.project.label></td>
-	  <td width="20%"><tmpl_var time.report.task.label></td>
-	  <td width="10%"><tmpl_var time.report.hours.label></td>
-	  <td width="40%"><tmpl_var time.report.comments.label></td>
-	  <td>&#160;</td>
-   </tr>
-   <tmpl_loop time.entry.loop>
-      <tr id="<tmpl_var row.id>">
-         <td class="cell"><tmpl_var form.taskEntryId><tmpl_var form.date></td>
-         <td class="cell"><tmpl_var form.project></td>
-         <td class="cell"><tmpl_var form.task></td>
-         <td class="cell"><tmpl_var form.hours></td>
-         <td class="cell"><tmpl_var form.comments></td>
-         <td><img src="<tmpl_var extras>/delete.gif" border="0" onclick="removeRow('<tmpl_var row.id>')" style="cursor:pointer"/></td>
-      </tr>
-   </tmpl_loop>
- </tbody>
-</table>
-
-<div style="text-align:left;margin-top:3px;margin-bottom:3px;">
-<table class="timeTracking02">
-<tbody>
-   <tr class="tt_empty" id="tt_empty">
-      <td colspan="6" style="border-top:solid gray 2px;">
-	      <table width="100%">
-		     <tr>
-			    <td width="60%" align="left">
-				   <tmpl_var time.report.complete.label><tmpl_var form.isComplete>
-				</td>
-				<td width="40%" align="right">
-					<input type="button" value="<tmpl_var time.add.row.label>" onclick="addRow();" /> &#160; <input type="submit" value="<tmpl_var time.save.label>" />
-			    </td>			
-		     </tr>
-	      </table>		
-	   </td>
-   </tr>
-</tbody>
-</table>
-</div>
-
-<table style="display:none" id="tt_table">
-   <tbody>
-      <tr id="<tmpl_var row.id>">
-         <td class="cell"><tmpl_var form.taskEntryId><tmpl_var form.date></td>
-         <td class="cell"><tmpl_var form.project></td>
-         <td class="cell"><tmpl_var form.task></td>
-         <td class="cell"><tmpl_var form.hours></td>
-         <td class="cell"><tmpl_var form.comments></td>
-         <td><img src="<tmpl_var extras>/delete.gif" border="0" onclick="removeRow('<tmpl_var row.id>')" style="cursor:pointer" /></td>
-      </tr>
-   </tbody>
-</table>
-
-
-
-
-~~~
-	
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_default_tt_view.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_default_tt_view.tmpl
deleted file mode 100644
index 12f4b959c..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_default_tt_view.tmpl
+++ /dev/null
@@ -1,284 +0,0 @@
-#TimeTrackingTMPL000001
-<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>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<script language="JavaScript">
-   var nextRowNum = <tmpl_var time.report.rows.total>;
-   var projectTasks = <tmpl_var project.task.array>  //Do not put a semi colon at the end of this.  The app does it
-   
-   //-----------------------------------------------------------------------------------
-   function changeOptions(proj,task) {
-      var projId = proj.value;
-	  //Remove all options from task list except first one
-	  var optLen = task.options.length;
-	  while (task.options.length > 1) {
-		 var elem = task.options[1];
-		 task.removeChild(elem);
-	  }
-	  
-	  if(projId != "") {
-	     //Add new options
-	     var array = projectTasks[projId];
-         for (var word in array) {
-            var opt = document.createElement("option");
-	        opt.setAttribute("value",word);
-	        opt.appendChild(document.createTextNode(array[word]));
-            task.appendChild(opt);
-         }
-      }
-	  
-	  //Fix IE Bug which causes dymamic repopulation to fail
-	  var newtask = task;
-	  var col = task.parentNode;
-	  col.removeChild(task);
-	  col.appendChild(newtask);
-	  
-   }
-   
-   //-----------------------------------------------------------------------------------
-   function recalcHours() {
-	   var newHours = 0;
-	   var rows = document.getElementById("ttbody");
-	   var rowLen = rows.childNodes.length;
-	   
-	   for(var i = 0; i <= rowLen; i++) {
-	      var row = rows.childNodes[i];
-		  if(row && row.id && row.id.indexOf("row") > -1) {
-		     var rowId = row.id;
-		     var idPart = rowId.split("_");
-		     var rowNum = idPart[1];
-		     var hourElem = document.getElementById("hours_"+rowNum+"_formId");
-		     if (hourElem) {
-		        newHours += parseFloat(hourElem.value);
-	         }
-	      }
-	   }
-	   document.getElementById('totalHours').innerHTML = newHours;
-   }
-
-   //-----------------------------------------------------------------------------------   
-   function getTarget(e) {
-      var targ;
-      if (!e) var e = window.event;
-      if (e.target) targ = e.target;
-      else if (e.srcElement) targ = e.srcElement;
-      if (targ.nodeType == 3) // defeat Safari bug
-         targ = targ.parentNode;
-      return targ
-   }  
-
-   //-----------------------------------------------------------------------------------    
-   function removeRow(e) {
-      if(!e) e = window.event || window.Event;
-	  var eleId = e;
-      if(typeof(e) == "object") {
-	    var targ = getTarget(e);
-		var eleId = targ.parentNode.parentNode.id;
-	  } 
-	  var row = document.getElementById(eleId);
-	  var ttbody = document.getElementById("ttbody");
-      var timeRowCount = getTimeRowCount();
-	  if(timeRowCount > 1) {
-	     ttbody.removeChild(row);
-	     recalcHours();
-		 return;
-	  }
-	  alert("<tmpl_var js.alert.removeRow.error>");
-   }
-   
-   //-----------------------------------------------------------------------------------   
-   function getTimeRowCount() {
-      var rows = document.getElementById("ttbody");
-      var rowLen = rows.childNodes.length;
-	  var count = 0;
-	  
-	  for(var i = 0; i <= rowLen; i++) {
-	     var row = rows.childNodes[i];
-		 //Skip Text and Attribute Nodes
-		 if(row && row.id && row.id.indexOf("row") > -1) count++;
-	  }
-	  return count;
-   }
-      
-   //-----------------------------------------------------------------------------------  
-   function addRow() {
-      var rowx = document.getElementById('row_x');
-	  var row = rowx.cloneNode(true);
-	  //Insert row into the right place
-	  var ttbody = document.getElementById('ttbody');
-	  ttbody.appendChild(row);
-	  
-	  row.id='row_'+nextRowNum;
-	  //Task Entry Id
-	  var rowLen = row.childNodes.length;
-	  for ( var i = 0; i < rowLen; i++) {
-	     var td = row.childNodes[i];
-		 var colLen = td.childNodes.length;
-		 for ( var j = 0; j < colLen; j++) {
-		    var node = td.childNodes[j];
-//			alert(node + " " + node.nodeType);
-			//Skip Text and Attirbute Node Types
-			if(node.nodeType != 1) continue;
-			//alert(node + " " + node.tagName);
-			var nodeName = node.name;
-				
-			//Handle Image Node
-			if(node.tagName == "IMG") {
-			   var newImg = document.createElement('img');
-			   newImg.setAttribute("style","cursor:pointer");
-			   newImg.src = "http://frank1.plainblack.net:8084/extras/wobject/TimeTracking/delete.gif";
-			   newImg.onclick = removeRow;
-			   
-			   childLen = node.childNodes.length;
-			  // alert("removing this node");
-			   td.removeChild(node);
-			   
-			  // alert("appending new node: " + newImg);
-			   td.appendChild(newImg);
-			   continue;
-			}
-			
-			//Skip Nodes that have no names
-			if(nodeName == "") continue;
-			var nameParts = nodeName.split("_");
-			var colName = nameParts[0];
-			//Set New Node Name
-			node.name = colName + "_" + nextRowNum;
-			//Set New Node ID
-			node.id = colName + "_" + nextRowNum + "_formId";
-			
-			if(colName == "projectId") {
-			   node.onchange = new Function('changeOptions(this,document.getElementById("taskId_'+nextRowNum+'_formId"));'); 
-			} 
-		 }   
-	  
-	  }
-	  nextRowNum++;
-   }
-   
-   //-----------------------------------------------------------------------------------   
-   function validateForm(form) {
-      //Set Row Total
-      form.rowTotal.value = (nextRowNum - 1);
-	  if(parseFloat(document.getElementById('totalHours').innerHTML) > 168) {
-	     alert("<tmpl_var js.alert.validate.hours.error>");
-		 return false;
-	  }
-	  
-	  var rows = document.getElementById("ttbody");
-      var rowLen = rows.childNodes.length;
-	  var isValid = true;
-	  	  
-	  for(var i = 0; i <= rowLen; i++) {
-	     var row = rows.childNodes[i];
-		 if(row && row.id && row.id.indexOf("row") > -1) {
-		    var rowId = row.id;
-		    var idPart = rowId.split("_");
-		    var rowNum = idPart[1];
-		    var taskDateElem = document.getElementById("taskDate_"+rowNum+"_formId");
-			taskDateElem.style.background='#FFFFFF';
-			var projectElem = document.getElementById("projectId_"+rowNum+"_formId");
-			projectElem.style.background='#FFFFFF';
-			var taskElem = document.getElementById("taskId_"+rowNum+"_formId");
-			taskElem.style.background='#FFFFFF';
-			var hourElem = document.getElementById("hours_"+rowNum+"_formId");
-			hourElem.style.background='#FFFFFF';
-			//Uncomment below if you wish comments to be required
-			//var comments = document.getElementById("hours_"+rowNum+"_formId");
-			//comments.style.background='#FFFFFF';
-			
-			//Uncomment below if you wish comments to be required
-			//if(taskDateElem.value != "" || projectElem.value != "" || taskElem.value != "" || hourElem.value != "" || comments.value != "" ) {
-			//Comment below if you wish comments to be required
-			if(taskDateElem.value != "" || projectElem.value != "" || taskElem.value != "" || (hourElem.value != "" && hourElem.value != "0")) {
-			   if(taskDateElem.value == "") {
-				  taskDateElem.style.background='#FFFF99';
-			      isValid = false;
-			   } 
-			   
-			   if(projectElem.value == "") {
-			      projectElem.style.background='#FFFF99';
-			      isValid = false;
-			   } 
-			   
-			   if(taskElem.value == "") {
-			      taskElem.style.background='#FFFF99';
-				  isValid = false;
-			   } 
-			   
-			   if(hourElem.value == "" || hourElem.value == 0) {
-			      hourElem.style.background='#FFFF99';
-				  isValid = false;
-			   }
-			   
-			   //Uncomment below if you wish comments to be required
-			   /*if(comments.value == "") {
-			      commnts.style.background='#FFFF99';
-				  isValid = false;
-			   }*/
-			}
-		 }
-	  }
-	  
-	  if(!isValid) {
-	     alert("<tmpl_var js.alert.validate.incomplete.error>");
-		 return false;
-	  }
-	  
-	  return true;
-   }
-   
-</script>
-
-<p><tmpl_if project.manage.url><a href="<tmpl_var project.manage.url>"><tmpl_var project.manage.label></a></tmpl_if></p>
-<tmpl_var form.header>
-<tmpl_var form.timetracker>
-<tmpl_var form.footer>
-
-~~~
-	<style type="text/css">
-		.timeTracking02 {			
-			width:850px;
-		}
-		.timeTracking02 td {
-			border:solid silver 1px;
-			border-bottom:solid gray 1px;
-			font-size:9pt;
-			font-family:arial;			
-		}
-		tr.tt_title td {
-			font-weight:bold;			
-			background-color:#F0F0F0;
-			border-style:none;
-			font-size:11pt;
-		}
-		tr.tt_header td {
-			font-weight:bold;
-			text-align:center;		
-		}
-		tr.tt_empty td {
-			border-style:none;
-		}
-		
-		.pt-select {
-	       font-weight: normal;
-	       color: black;
-  	       width: 175px;
-        }
-		.date-select {
-		   font-weight: normal;
-	       color: black;
-  	       width: 100px;
-		}
-	</style>
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_flash_template.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_flash_template.tmpl
deleted file mode 100644
index 14b22aa0b..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_flash_template.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-#pbtmpl0000000000000220
-<tmpl_if session.var.adminOn>
-	<tmpl_if controls>
-		<p><tmpl_var controls></p>
-	</tmpl_if>
-</tmpl_if>
-
-
-<div>
-	<object type="application/x-shockwave-flash" data="<tmpl_var fileUrl>" style="height:auto;min-height:100px;width:100%;display:block;">
-		<param name="movie" value="<tmpl_var fileUrl>" />		
-	</object>
-</div>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_indentnav.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_indentnav.tmpl
deleted file mode 100644
index f7693f6b6..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_indentnav.tmpl
+++ /dev/null
@@ -1,60 +0,0 @@
-#PBnav00000000indentnav
-#title:Indent Nav
-#create
-#menuTitle:Indent Nav
-#url:indent_nav
-#namespace:Navigation
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>			
-		
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-		
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>		
-		
-<div class="mainNav">
-	<tmpl_loop page_loop>	
-		<div class="level<tmpl_var page.relDepth>">
-			<a <tmpl_if page.isCurrent> class="navOn"</tmpl_if><tmpl_if page.isAncestor> class="anAncestor" </tmpl_if><tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
-		</div>		
-	</tmpl_loop>
-</div>
-~~~
-<style type="text/css">
-.mainNav {
-
-}
-.mainNav a {
-	
-}
-a.navOn {
-	
-}
-a.anAncestor {
-
-}
-div.level0 a {
-	margin-left:0px;
-	display:block;
-}
-div.level1 a {
-	margin-left:15px;
-	display:block;	
-}
-div.level2 a {
-	margin-left:30px;
-	display:block;
-}
-div.level3 a {
-	margin-left:45px;
-	display:block;
-}
-div.level4 a {
-	margin-left:60px;
-	display:block;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_request_tracker_post_template.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_request_tracker_post_template.tmpl
deleted file mode 100644
index a6f2146be..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_request_tracker_post_template.tmpl
+++ /dev/null
@@ -1,347 +0,0 @@
-#PBtmpl0000000000000209
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<div class="defaultSubmissionDetails">
-	<b><tmpl_var user.label>:</b> 
-		<tmpl_if user.isVisitor>
-			<tmpl_var username>
-		<tmpl_else>
-			<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-		</tmpl_if>
-		<br />
-	<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-	<b><tmpl_var severity.label>:</b> <tmpl_var userDefined1><br />
-	<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-	<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-		<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-		</tmpl_unless>
-		<br />
-	<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> &nbsp; &nbsp; [ <a href="<tmpl_var unarchive.url>"><tmpl_var open.label></a> <tmpl_else> <tmpl_var open.label> &nbsp; &nbsp; [ <a href="<tmpl_var archive.url>"><tmpl_var close.label></a></tmpl_if> ]<br />
-	<tmpl_else>	
-		<tmpl_if user.isPoster>
-			<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> <tmpl_else> <tmpl_var open.label></tmpl_if><br />
-		</tmpl_if>	
-	</tmpl_if>	
-<tmpl_if karmaIsEnabled>
-	<b><tmpl_var karmaRank.label>:</b> <tmpl_var karmaRank><br />
-<b><tmpl_var transferkarma.label>:</b>
-<tmpl_var transfer.karma.form>
-</tmpl_if>	
-</div>
-
-<div class="collaborationThreadContent">
-	<tmpl_var content>
-</div>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<div style="clear:both;"></div>
-
-<tmpl_if repliesAllowed>
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>														
-							</td>
-						</tr>
-						</table>
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="width:50%;text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>														
-							</td>
-						</tr>
-						</table>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>
-	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a>				
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-~~~
-<style type="text/css">
-.defaultSubmissionDetails
-{
-	float: right; 		
-	padding: 2px; 
-	margin: 2px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:20px;
-}
-
-.defaultSubmissionDetails a
-{
-	color:#29587E;
-}
-
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	background-color: #eeeeee;
-	padding: 3px;
-}
-.postData td {
-	font-size: 9pt;
-	color: black;
-	font-family:arial;
-}
-.postControls {
-	border-top: 1px solid #cccccc;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-	clear:both;
-	width:100%;
-display:block;
-	-moz-box-sizing:border-box;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.threadData {
-	font-size: 11px;
-	padding: 3px;
-	font-family:arial;
-}
-
-.postControls
-{
-	background:#C0C0C0;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-
-.postControls a:link, .postControls a:visited
-{
-	color:white;
-}
-
-.collaborationThreadContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_table_left_column.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_table_left_column.tmpl
deleted file mode 100644
index e4a1b3a2e..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_table_left_column.tmpl
+++ /dev/null
@@ -1,22 +0,0 @@
-#PBtmpl00000000table125
-#title:Left Column (Table)
-#menuTitle:Left Column (Table)
-#url:left_column_table
-#namespace:Layout
-#create
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>

<tmpl_if showAdmin>
<p><tmpl_var controls></p>
</tmpl_if>


<tmpl_if displayTitle>
  <h2><tmpl_var title></h2>
</tmpl_if>
-
-<table cellpadding="5">
-<tr>
-	<td class="firstColumn" align="left" valign="top">
-		<!-- begin position 1 -->
		<div class="layoutColumnPadding">
		<tmpl_if showAdmin>
			<table border="0" id="position1" class="content"><tbody>
		</tmpl_if>

		<tmpl_loop position1_loop>
			<tmpl_if showAdmin>
		            	<tr id="td<tmpl_var id>">
		            		<td><div id="td<tmpl_var id>_div" class="dragable">
			</tmpl_if>

			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>

			<tmpl_if showAdmin>
		         			</div></td>
		            	</tr>
			</tmpl_if>
		</tmpl_loop>

		<tmpl_if showAdmin>
		            </tbody></table>
		</tmpl_if>
		</div>
		<!-- end position 1 -->	
-	</td>
-	<td class="secondColumn" align="left" valign="top">
-		<!-- begin position 2 -->
		<div class="layoutColumnPadding">
		<tmpl_if showAdmin>
			<table border="0" id="position2" class="content"><tbody>
		</tmpl_if>

		<tmpl_loop position2_loop>
			<tmpl_if showAdmin>
		            	<tr id="td<tmpl_var id>">
		            		<td><div id="td<tmpl_var id>_div" class="dragable">
			</tmpl_if>

			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>

			<tmpl_if showAdmin>
		         			</div></td>
		            	</tr>
			</tmpl_if>
		</tmpl_loop>

		<tmpl_if showAdmin>
		            </tbody></table>
		</tmpl_if>
		</div>
		<!-- end position 2 -->	
-	
-	</td>
-</tr>
-</table>
-
<tmpl_if description>
  <p><tmpl_var description></p>
</tmpl_if>

<tmpl_if showAdmin>
	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
            <tmpl_var dragger.init>
</tmpl_if>
-~~~
-<style type="text/css">
.firstColumn {
  width: 35%;
}
.secondColumn {
        max-width: 65%;
}
</style>
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_table_news.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_table_news.tmpl
deleted file mode 100644
index b85187191..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_table_news.tmpl
+++ /dev/null
@@ -1,150 +0,0 @@
-#PBtmpl00000000table094
-#create
-#title:News (Table)
-#menuTitle:News (Table)
-#url:news_table
-#namespace:Layout
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellpadding="5">
-<tr>
-	<td align="left" valign="top" colspan="2">
-		<!-- begin position 1 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position1" class="content"><tbody>
-		</tmpl_if>
-		<tmpl_loop position1_loop>
-			<tmpl_if showAdmin>
-				<tr id="td<tmpl_var id>">
-				<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-				</div></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-			</tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 1 -->	
-	</td>
-</tr>
-<tr>
-	<td class="firstColumn" align="left" valign="top">
-		<!-- begin position 2 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position2" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position2_loop>
-			<tmpl_if showAdmin>
-				<tr id="td<tmpl_var id>">
-				<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-				</div></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-			</tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 2 -->	
-	</td>
-	<td class="secondColumn" align="left" valign="top">
-		<!-- begin position 3 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position3" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position3_loop>
-			<tmpl_if showAdmin>
-				<tr id="td<tmpl_var id>">
-				<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-				</div></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-			</tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 3 -->	
-	</td>
-</tr>	
-<tr>
-	<td align="left" valign="top" colspan="2">
-		<!-- begin position 4 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position4" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position4_loop>
-			<tmpl_if showAdmin>
-				<tr id="td<tmpl_var id>">
-				<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-				</div></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-			</tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 4 -->	
-	</td>
-</tr>
-</table>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-	<tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-	width: 50%;
-}
-.secondColumn {
-	width: 50%;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_table_right_column.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_table_right_column.tmpl
deleted file mode 100644
index 1f580e39b..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_table_right_column.tmpl
+++ /dev/null
@@ -1,92 +0,0 @@
-#PBtmpl00000000table131
-#create
-#title:Right Column (Table)
-#menuTitle:Right Column (Table)
-#url:right_column_table
-#namespace:Layout
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-  <h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-  <p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellspacing="5">
-<tr>
-	<td class="firstColumn" valign="top" align="left">
-		<!-- begin position 1 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position1" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position1_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 1 -->	
-	</td>
-	<td class="secondColumn" valign="top" align="left">
-		<!-- begin position 2 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position2" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position2_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 2 -->	
-	</td>
-</tr>
-</table>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-            <tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-	width: 65%;
-}
-.secondColumn {
-    width: 35%;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_table_side_by_side.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_table_side_by_side.tmpl
deleted file mode 100644
index 6c482d320..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_table_side_by_side.tmpl
+++ /dev/null
@@ -1,93 +0,0 @@
-#PBtmpl00000000table135
-#create
-#title:Side By Side (Table)
-#menuTitle:Side By Side (Table)
-#url:side_by_side_table
-#namespace:Layout
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<table>
-<tr>
-	<td class="firstColumn" valign="top" align="left">
-		<!-- begin position 1 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position1" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position1_loop>
-			<tmpl_if showAdmin>
-				<tr id="td<tmpl_var id>">
-				<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-				</div></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-			</tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 1 -->	
-	</td>
-	<td class="secondColumn" valign="top" align="left">
-		<!-- begin position 2 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position2" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position2_loop>
-			<tmpl_if showAdmin>
-				<tr id="td<tmpl_var id>">
-				<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-				</div></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-			</tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 2 -->	
-	</td>
-</tr>
-</table>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-	<tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-	width: 50%;
-}
-
-.secondColumn {	
-	width:50%;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.2/wgtemplate_table_three_over_one.tmpl b/docs/upgrades/templates-6.99.2/wgtemplate_table_three_over_one.tmpl
deleted file mode 100644
index 64e16c94b..000000000
--- a/docs/upgrades/templates-6.99.2/wgtemplate_table_three_over_one.tmpl
+++ /dev/null
@@ -1,152 +0,0 @@
-#PBtmpl00000000table118
-#create
-#title:Three Over One (Table)
-#menuTitle:Three Over One (Table)
-#url:three_over_one_table
-#namespace:Layout
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-<p><tmpl_var controls></p>
-</tmpl_if>
-
-
-<tmpl_if displayTitle>
-  <h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-  <p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellpadding="5">
-<tr>
-	<td class="firstColumn" align="left" valign="top">
-		<!-- begin position 1 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position1" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position1_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 1 -->	
-	</td>
-	<td class="secondColumn" align="left" valign="top">
-		<!-- begin position 2 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position2" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position2_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 2 -->	
-	</td>	
-	<td class="thirdColumn" align="left" valign="top">
-		<!-- begin position 3 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position3" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position3_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 3 -->	
-	</td>
-</tr>
-<tr>
-	<td align="left" valign="top" colspan="3">
-		<!-- begin position 4 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position4" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position4_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 4 -->	
-	</td>
-</tr>
-</table>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-            <tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-	width: 33%;
-}
-.secondColumn {
-    width: 33%;
-}
-.thirdColumn {
-	width: 33%;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.3/default-ems-search-template.tmpl b/docs/upgrades/templates-6.99.3/default-ems-search-template.tmpl
deleted file mode 100644
index 2ac3723ef..000000000
--- a/docs/upgrades/templates-6.99.3/default-ems-search-template.tmpl
+++ /dev/null
@@ -1,904 +0,0 @@
-#EventManagerTmpl000006
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if session.var.adminOn>
-        <p><tmpl_var controls></p><br /><br />
-</tmpl_if>
-
-<tmpl_if badgeSelected>
-<table border="0" cellpadding="5" cellspacing="0" width="100%">
-<tr>
-	<td style="width:50%;" valign="top">
-		<div class="badge">
-			<tmpl_loop badgeHolderInfo_loop>
-			<h2><tmpl_var mainEventTitle><br /><tmpl_var firstName> <tmpl_var lastName></h2>
-
-			<!-- USER DATA -->
-			<div class="badgeContent" style="background-color:#E5E5E5;">
-				<table cellpadding="1" cellspacing="3" width="100%" class="userData">
-				<tbody>
-				<tr>
-					<td style="width:65px;">&nbsp;Address</td>
-					<td class="data">&nbsp;<tmpl_var address></td>
-				</tr>
-				<tr>
-					<td>&nbsp;City</td>
-					<td class="data">&nbsp;<tmpl_var city></td>
-				</tr>
-				<tr>
-					<td>&nbsp;State</td>
-					<td class="data">&nbsp;<tmpl_var state></td>
-				</tr>
-				<tr>
-					<td>&nbsp;ZIP</td>
-					<td class="data">&nbsp;<tmpl_var zipCode></td>
-				</tr>
-				<tr>
-					<td>&nbsp;Phone</td>
-					<td class="data">&nbsp;<tmpl_var phone></td>
-				</tr>
-				<tr>
-					<td>&nbsp;Country</td>				
-					<td class="data">&nbsp;<tmpl_var country></td>
-				</tr>			
-				</tbody>
-				</table>
-			</tmpl_loop>
-			</div>
-			<!-- END USER DATA -->
-			
-			<!-- BADGE EVENT -->
-			<tmpl_loop eventsInBadge_loop>
-			<div class="badgeContent">
-				<table cellpadding="0" cellspacing="0" width="100%">
-				<tbody>
-				
-				<tr>
-					<td style="width:43%;text-align:left;"><tmpl_var title></td>
-					<td style="width:40%;text-align:right;">^D("%W %Z",<tmpl_var startDate>);</td>
-					<td style="width:17%;text-align:right;"><tmpl_if removeEventFromBadge.url><a href="<tmpl_var removeEventFromBadge.url>">Remove</a></tmpl_if></td>
-				</tr>
-				
-				</tbody>
-				</table>
-			</div>
-			</tmpl_loop>
-			<!-- END BADGE EVENT -->
-			
-
-			<!-- BADGE FOOTER -->
-			<div class="badgeFooter">
-				<table cellpadding="0" cellspacing="0" width="100%">
-				<tbody>
-				<tr>
-					<td style="width:50%;"><a href="<tmpl_var resetScratchCartUrl>" style="float:left;">Start Over</a></td>
-					<td style="width:50%;"><a href="<tmpl_var continue.url>" style="float:right;">Add Contents to Cart</a></td>					
-				</tr>
-				</tbody>
-				</table>	
-			</div>
-			<!-- END BADGE FOOTER -->
-		</div>
-	</td>
-	<td style="width:50%;" valign="top">			
-			<tmpl_if cart.purchaseLoop>
-			<div class="cart">
-				<h2>Shopping Cart</h2>
-				<tmpl_loop cart.purchaseLoop>
-				<div class="cartContent">
-					<tmpl_var deleteIcon><tmpl_var editIcon> <tmpl_var purchase.mainEventTitle> <br />
-					<tmpl_loop registrantInfoLoop>
-					Name: <tmpl_var firstName> <tmpl_var lastName>
-					</tmpl_loop>
-					<br />Additional Price: $<tmpl_var newPrice> 
-				</div>
-				</tmpl_loop>
-				<!-- OEOS -->
-				<div style="text-align:right;margin:0px;">
-					<a href="<tmpl_var emptyCart.url>">Empty Cart</a> &bull; <a href="<tmpl_var checkout.url>">Checkout</a>
-				</div>
-			</div>
-			</tmpl_if>
-			<br />
-			<div class="eventSearch">
-					<h2>Search Instructions</h2>
-			
-					<span style="font-style: italic; font-weight: bold">Basic Search</span> - This is the events search screen. There is a basic search box which allows you to search by event number, event title, and event description.<br /><br />
-
-					<span style="font-style: italic; font-weight: bold">Advanced Search</span> - Click on <span style="color: blue">Advanced Search</span> and you will see a pull-down list appear in the search area. Select which event characteristic you would like to search by and then in the next drop-down box specify what type of search to do (equals, contains, is not, not like, starts with, ends with). Most searches will likely be "<span style="font-style: italic;">contains</span>."
-		</div>
-		<br />
-
-	</td>
-</tr>
-<tr>
-	<td colspan="2">
-		<div class="eventSearch">
-			<h2>Search</h2>
-			
-<script type="text/javascript" src="<tmpl_var ems.wobject.dir>/script/dynamicForms.js"></script>
-
-<script type="text/javascript">
-function popUp(URL) {
-day = new Date();
-id = day.getTime();
-eval("page" + id + " = window.open(URL, '" + id + "', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=500')");
-}
-
-   <tmpl_var search.filters.options>
-   var advanced = 0;
-   var filterCount = 0;
-
-	function setSelectValue(selObj,newValue) {
-		for (var i=0; i<selObj.options.length; i++) {
-			selObj.options[i].selected = (selObj.options[i].value==newValue)?true:false;
-		}
-	}
-	
-
-   function toggleTitle(obj) {
-      if (obj.checked) {
-	     document.getElementById('cs_search_title_td').style.display='inline';
-	  } else {
-	     document.getElementById('cs_search_title_td').style.display='none';
-	  }
-   }
-   
-   function openWin (url, name, param) {
-      var newwin = window.open(url, name, param);
-      newwin.focus();
-   }
-   
-   function buildFilterList() {
-      return "Custom Filter";
-   }
-   
-   function stripDelim(value,delim) {
-      value = value.replace(/delim/g,"");
-	  return value;
-   }
-
-	function unset(array, valueToUnset){
-		var output=new Array(0);
-		for(var i in array){
-			if(i==valueToUnset){continue;}
-			output[i]=array[i];
-		}
-		return output;
-	}
-</script>
-<div id="basicSearch">
-<tmpl_var advSearch.formHeader>
-<table width="100%" border="0" cellpadding="1" style="border-bottom:double gray 5px;border-top:solid gray 1px;margin-bottom:5px;margin-top:5px;">
-   <tbody id="filterbody">
-   <tr>
-      <td style="font-weight:bold;width:80px;">Search Events:</td>
-	  <td><input name="searchKeywords" /></td>
-   </tr>
-   
-   </tbody>
-</table>
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-	<td align="left" valign="top"><a href="javascript:void(addField())">Advanced Search</a></td>
-	<td align="right"><input type="submit" name="filter" id="filter_formId" value="Display Results" onclick="this.value='Please wait...'" /></td>
-</tr>
-</table>
-<!-- <tmpl_var search.formSubmit> -->
-<tmpl_var search.formFooter>
-</div>
-
-			
-		</div>
-	</td>
-</tr>
-<tr>
-	<td colspan="2">
-		<tmpl_var sortForm.header>
-		<div class="EMS_searchFilter">
-			<table width="100%">
-			<tbody>
-			<tr>
-				<td style="width:150px;text-align:left;"><i>Your search returned <tmpl_var numberOfSearchResults> results.</i></td>
-				<td>
-					<table>
-					<tbody>
-					<tr>
-						<td><tmpl_var sortForm.selectBox.label></td>
-						<td><tmpl_var sortForm.selectBox></td>
-						<td><tmpl_var sortForm.submit></td>
-					</tr>
-					</tbody>
-					</table>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2" align="center">
-					<div style="align: center;">
-						<tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount>
-					</div>
-				</td>
-			</tr>
-			</tbody>
-			</table>
-		</div>
-		<tmpl_var sortForm.footer>
-		
-		<div class="eventList">
-			<h2>Available Events</h2>
-		
-			<!-- EVENT -->			
-				<table cellpadding="2" cellspacing="0" border="0" class="event">
-				<tbody>
-				<tr>
-					<th>Event<br />Number</th>
-					<th>Event<br />Name</th>
-					<th>Start<br />Date</th>
-					<th>End<br />Date</th>
-					<th>Seats Left/<br />Available</th>
-					<th>Price</th>
-					<th>Add to Badge</th>
-				</tr>
-				<tmpl_loop events_loop>
-				<tr>
-					<td style="width:9%;white-space:nowrap" class="left">
-						<tmpl_if canManageEvents><tmpl_var manageToolbar>
-						<tmpl_unless eventIsApproved><span style="color:red;font-size:9pt;font-weight:bold;">&bull; Not Approved</span><tmpl_else><span style="color:green;font-size:9pt;font-weight:bold;">&bull; Approved</span></tmpl_unless></tmpl_if>
-					</td>
-					<td style="width:25%;"><tmpl_var title></td>
-					<td style="width:14%;">^D("%W %Z",<tmpl_var startDate>);</td>
-					<td style="width:14%;">^D("%W %Z",<tmpl_var endDate>);</td>
-					<td style="width:14%;"><tmpl_var seatsRemaining>/<tmpl_var maximumAttendees></td>
-					<td style="width:10%;"><tmpl_var price></td>
-					<td style="width:14%;" class="right">
-						<tmpl_unless eventIsFull>
-							<a href="<tmpl_var purchase.url>"><tmpl_var purchase.label></a>
-						<tmpl_else>
-							<tmpl_var purchase.label>
-						</tmpl_unless>
-					</td>
-				</tr>
-				</tmpl_loop>
-				</tbody>
-				</table>			
-			<!-- END EVENT -->
-		</div>	
-		<div class="EMS_searchFilter" style="height:23px;">
-			<table width="100%">
-			<tbody>
-			<tr>
-				<td align="center">
-					<div style="align: center;">
-						<tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount>
-					</div>
-				</td>
-			</tr>
-			</tbody>
-			</table>
-		</div>
-		<br />
-	</div>
-	</td>
-</tr>
-</table>
-
-<tmpl_else>
-<ul>
-<tmpl_if canManageEvents>
-   <li><a href="<tmpl_var addEvent.url>"><tmpl_var addEvent.label></a></li>
-   <li><a href="<tmpl_var manageRegistrants>">Manage Registrants</a> (Event Directors and Staff)</li>
-   <li><a href="<tmpl_var manageEvents.url>">Manage Events</a> (Event Directors and Staff)</li></tmpl_if>
-<tmpl_unless badgeSelected>
-   <li><a href="^PageUrl;">Return To Badge List to begin a badge purchase</a></li></tmpl_unless>
-</ul>
-
-<tmpl_if badgeSelected>
-<div><a href="<tmpl_var resetScratchCartUrl>">Click Here to add events to a badge you've already purchased, or to select a different badge. (Start Over)</a></div><br /><br />
-<div><span class="StepLabel">Step 2: </span><h2> Add Events to your Badge</h2></div>
-<tmpl_else>
-<div><span class="StepLabel">Browse Events: </span> You have not selected a Badge.  You cannot add events to your cart until you select a badge.</div>
-</tmpl_if>
-<tmpl_var calendarJS>
-<tmpl_unless noSearchDialog>
-<script type="text/javascript" src="<tmpl_var ems.wobject.dir>/script/dynamicForms.js"></script>
-
-<script type="text/javascript">
-function popUp(URL) {
-day = new Date();
-id = day.getTime();
-eval("page" + id + " = window.open(URL, '" + id + "', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=500')");
-}
-
-   <tmpl_var search.filters.options>
-   var advanced = 0;
-   var filterCount = 0;
-
-	function setSelectValue(selObj,newValue) {
-		for (var i=0; i<selObj.options.length; i++) {
-			selObj.options[i].selected = (selObj.options[i].value==newValue)?true:false;
-		}
-	}
-	
-
-   function toggleTitle(obj) {
-      if (obj.checked) {
-	     document.getElementById('cs_search_title_td').style.display='inline';
-	  } else {
-	     document.getElementById('cs_search_title_td').style.display='none';
-	  }
-   }
-   
-   function openWin (url, name, param) {
-      var newwin = window.open(url, name, param);
-      newwin.focus();
-   }
-   
-   function buildFilterList() {
-      return "Custom Filter";
-   }
-   
-   function stripDelim(value,delim) {
-      value = value.replace(/delim/g,"");
-	  return value;
-   }
-
-	function unset(array, valueToUnset){
-		var output=new Array(0);
-		for(var i in array){
-			if(i==valueToUnset){continue;}
-			output[i]=array[i];
-		}
-		return output;
-	}
-</script>
-
-<div id="basicSearch">
-<tmpl_var advSearch.formHeader>
-<h2>How to Use the Events Search</h2>
-<p><span style="font-style: italic; font-weight: bold">Basic Search</span> - This is the events search screen. There is a basic search box which allows you to search by event number, event title, and event description.
-
-<p><span style="font-style: italic; font-weight: bold">Advanced Search</span> - Click on <span style="color: blue">Advanced Search</span> and you will see a pull-down list appear in the search area. Select which event characteristic you would like to search by and then in the next drop-down box specify what type of search to do (equals, contains, is not, not like, starts with, ends with). Most searches will likely be "<span style="font-style: italic;">contains</span>."
-
-<table width="100%" border="0" cellpadding="1" style="border-bottom:double gray 5px;border-top:solid gray 1px;margin-bottom:5px;margin-top:5px;">
-   <tbody id="filterbody">
-   <tr>
-      <td style="font-weight:bold;width:80px">Search Events:</td>
-	  <td><input name="searchKeywords" /></td>
-   </tr>
-   
-   </tbody>
-</table>
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-	<td align="left" valign="top"><a href="javascript:void(addField())">Search By...</a></td>
-	<td align="right"><input type="submit" name="filter" id="filter_formId" value="Display Search Results" onclick="this.value='Please wait...'" /></td>
-</tr>
-</table>
-<!-- <tmpl_var search.formSubmit> -->
-<tmpl_var search.formFooter>
-</div>
-</tmpl_unless><!-- noSearchDialog -->
-<br /><br />
-<tmpl_if badgeSelected>
-<tmpl_if continue.url><table><tr><td align="right"><span class="StepLabel">Go to Step 3:</span><a href="<tmpl_var continue.url>">Add Badge and Events to Cart</a></td></tr><tr><td align="right"><span class="StepLabel">Go to Step 3:</span><a href="<tmpl_var checkoutNow.url>">Add Badge and Events to Cart and Checkout</a></td></tr></table></tmpl_if>
-</tmpl_if>
-
-<p><tmpl_var message></p>
-<tmpl_if badgeSelected>
-<p>Of the events you may add to this badge, your search returned <tmpl_var numberOfSearchResults> results.</p>
-<tmpl_else>
-<p>Your search returned <tmpl_var numberOfSearchResults> results.</p>
-</tmpl_if>
-
-<p><tmpl_var addToBadgeMessage></p>
-<div style="text-align: center;"><tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount></div><br />
-
-<!-- Sort Form -->
-<div style="align: right;">
-<tmpl_var sortForm.header>
-<tmpl_var sortForm.selectBox.label>&nbsp;
-<tmpl_var sortForm.selectBox>
-<tmpl_var sortForm.submit>
-<tmpl_var sortForm.footer>
-</div>
-
-<table width="100%" border="0" cellpadding="8" cellspacing="0" style="border-top:solid gray 2px;border-bottom:solid gray 2px;">
-<tr>
-<th>Event #</th>
-<th><tmpl_var name.label></th>
-<th><tmpl_var starts.label></th>
-<th><tmpl_var ends.label></th>
-<th>Seats<br />(Available/Max)</th>
-<th><tmpl_var price.label></th>
-<tmpl_if badgeSelected>
-<th>Add to Cart</th></tmpl_if>
-</tr>
-<tmpl_loop events_loop>
-  <tr<tmpl_unless __ODD__> class="oddRow"<tmpl_else> class="evenRow"</tmpl_unless>>
-
-  <td style="white-space:nowrap;">
-    <tmpl_if canManageEvents><tmpl_var manageToolbar>
-        <tmpl_unless eventIsApproved><span style="color:red;font-size:9pt;font-weight:bold;">&bull; Not Approved</span><tmpl_else><span style="color:green;font-size:9pt;font-weight:bold;">&bull; Approved</span></tmpl_unless></tmpl_if>
-  </td><td><tmpl_var title>
-  </td><td>^D("%W %Z",<tmpl_var startDate>);
-  </td><td>^D("%W %Z",<tmpl_var endDate>);
-  </td><td style="text-align: center;"><tmpl_var seatsRemaining>/<tmpl_var maximumAttendees>
-  </td><td><tmpl_var price>
-  </td><tmpl_if badgeSelected>
-    <td style="text-align: center;">
-      <tmpl_if canManageEvents>
-		<tmpl_unless eventIsFull>
-			<a href="<tmpl_var purchase.url>"><tmpl_var purchase.label></a>
-		<tmpl_else>
-			<tmpl_var purchase.label>
-		</tmpl_unless>
-      </tmpl_if>
-  </td>
-    </tmpl_if></tr>
-</tmpl_loop>
-
-</table>
-
-<div style="text-align: center;"><tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount></div>
-
-
-
-</tmpl_if>
-~~~
-<style type="text/css">
-
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-.manageEvents {
-	margin-top:5px;
-	margin-bottom:5px;
-}
-.datacardtitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:13px;
-}
-
-.leftnav{
-	padding: 1px 1px 1px 1px;
-	background: white;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.leftnavon{
-	padding: 1px 1px 1px 1px;
-	background: yellow;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.calendartitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-}
-.filter-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 105px;
-}
-.compare-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 76px;
-}
-.filter-text {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 114px;
-}
-.smLink {
-   font-family: verdana;
-   font-size: 10px;
-   font-weight: normal;
-   color: blue;
-}
-
-.StepLabel { font-family: Tahoma; font-size: 14pt; letter-spacing: 2pt; color: #234E9C; 
-               font-weight: bold }
-
-/* BADGE CSS */
-		.badge {
-			width:92%;
-			background-color:#F0F0F0;
-			-moz-border-radius:15px;
-			padding:5px;	
-			-moz-box-sizing:border-box;
-			font-family:verdana;
-			font-size:9pt;
-		}
-		.badge h2 {
-			width:100%;
-			font-size:12.5pt;
-			background-color:#E2E2E2;
-			text-align:center;
-			-moz-border-radius-topLeft:15px;
-			-moz-border-radius-topRight:15px;
-			margin:0px;
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;			
-			color:gray;			
-		}
-		.badgeContent {
-			width:100%;
-			background-color:#F4F4F4;			
-			margin:0px;
-			margin-top:5px;
-			margin-bottom:5px;
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;			
-			font-family:verdana;
-			font-size:9pt;
-		}
-		.badgeContent a {
-			background-color:#CF1D1D;
-			padding:5px;			
-			color:white;
-			border:solid #9C1616 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-			width:40px;
-			font-size:7pt;
-			float:right;
-			margin-left:10px;
-		}
-		.badgeContent a:hover {
-			background-color:#9C1616;
-			color:#CF1D1D;
-			color:white;		
-		}		
-		.badgeFooter {
-			width:100%;
-			background-color:#E2E2E2;			
-			-moz-border-radius-bottomLeft:15px;
-			-moz-border-radius-bottomRight:15px;
-			margin:0px;			
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;				
-			text-align:center;
-		}
-		.badgeFooter a {				
-			
-			background-color:#E2E2E2;
-			padding:5px;			
-			color:gray;
-			border:solid #F4F4F4 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-		}
-		.badgeFooter a:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-		.userData td {
-			background-color:#E2E2E2;
-			font-size:7pt;
-			-moz-border-radius:15px;
-			border:solid #F4F4F4 1px;
-			font-weight:bold;
-			
-		}
-		.userData td.data {
-			background-color:#F4F4F4;
-			border:solid #E2E2E2 1px;
-			font-weight:normal;
-		}	
-		/* END OF BADGE CSS */
-		
-		
-		
-		/* EVENT LIST CSS */
-		.eventList, .eventSearch {
-			width:95%;
-			border:solid #F0F0F0 1px;
-			padding:2px;
-			-moz-border-radius-topLeft:15px;
-			-moz-border-radius-topRight:15px;	
-			font-family:verdana;
-			font-size:9pt;
-		}
-		.eventList h2, .eventSearch h2 {
-			margin:0px;
-			width:100%;
-			font-family:verdana;
-			text-align:center;
-			font-size:11pt;
-			background-color: #F0F0F0;
-			color:gray;
-			-moz-border-radius-topLeft:15px;
-			-moz-border-radius-topRight:15px;
-			-moz-box-sizing:border-box;			
-		}
-		.eventList {	
-			width:98%;
-			border:solid #E0E0E0 1px;			
-			font-size:9pt;
-			font-family:verdana;
-			/*background-color:#F4F4F4;*/
-			margin-top:2px;
-			-moz-box-sizing:border-box;
-			padding-bottom:25px;
-			-moz-border-radius-bottomLeft:15px;
-			-moz-border-radius-bottomRight:15px;									
-		}
-		.event {
-			width:100%;						
-			font-size:9pt;
-			font-family:verdana;
-			background-color:#F4F4F4;
-			margin-top:2px;
-			-moz-box-sizing:border-box;			
-		}
-		.event td {
-			border-top:solid #E0E0E0 1px;
-			border-bottom:solid #E0E0E0 1px;
-			text-align:center;
-		}
-		.event th {
-			font-size:8pt;
-			text-align:center;
-			background:white;
-		}
-		.event td.left {
-			border-left:solid #E0E0E0 1px;
-		}
-		.event td.right {
-			border-right:solid #E0E0E0 1px;
-		}	
-		.event td.empty {
-			background-color:white;
-			border-style:none;
-			font-size:1px;
-		}
-		.event a {
-			background-color:#E2E2E2;
-			padding:5px;			
-			color:gray;
-			border:solid #F4F4F4 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;		
-			width:80%;
-		}
-		.event a:hover {
-			border: solid #E2E2E2 1px;
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-		/* END EVENT LIST CSS */
-		
-		
-		/* INSTRUCTIONS */
-		.instructions {
-			width:95%;
-			border:solid #F0F0F0 1px;
-			padding:5px;
-			-moz-border-radius-topLeft:15px;
-			-moz-border-radius-topRight:15px;	
-			font-family:verdana;
-			font-size:9pt;
-		}
-		/* END INSTRUCTIONS */
-
-		
-		/* SEARCH */
-		.eventSearch form {
-			margin:0px;
-		}
-		.eventSearch .searchBtn {
-			background-color:#E2E2E2;			
-			color:gray;
-			padding-top:1px;
-			padding-bottom:1px;
-			border:solid #F4F4F4 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;		
-		}
-		.searchBtn:hover {
-			border: solid #E2E2E2 1px;
-			background-color:#F0F0F0;
-			color:gray;		
-		}
-		.advSearch input, .advSearch select{
-			font-size:8pt;
-		}
-		.advSearch .button {
-			background-color:#CF1D1D;
-			padding-left:2px;			
-			padding-right:2px;			
-			color:white;
-			border:solid #9C1616 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-			width:30px;
-			font-size:10pt;			
-			margin-left:10px;	
-			height:100%;
-		}
-		.advSearch .button:hover {
-			background-color:#9C1616;
-			color:#CF1D1D;
-			color:white;		
-		}
-		.advSearch .compare-select {
-			width:75px;
-		}		
-		.advSearch .filter-text {
-			width:98%;
-		}
-		* html .advSearch .filter-text {
-			width:97%;
-		}
-		.advSearch tr.border td {
-			font-size:1pt;
-			background-color:#CFCFCF;
-		}
-		/* END SEARCH */
-/* cart CSS */
-		.cart {
-			width:95%;
-			background-color:#F0F0F0;
-			-moz-border-radius:15px;
-			padding:5px;	
-			-moz-box-sizing:border-box;
-			font-family:verdana;
-			font-size:9pt;
-		}
-		.cart h2 {
-			width:100%;
-			font-size:12.5pt;
-			background-color:#E2E2E2;
-			text-align:center;
-			-moz-border-radius-topLeft:15px;
-			-moz-border-radius-topRight:15px;
-			margin:0px;
-			border:solid #E0E0E0 1px;			
-			-moz-box-sizing:border-box;			
-			color:gray;			
-		}
-		.cartContent {
-			width:100%;
-			background-color:#F4F4F4;			
-			margin:0px;
-			margin-top:5px;
-			margin-bottom:5px;
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;			
-			font-family:verdana;
-			font-size:9pt;
-		}
-		.cartContent a {
-			background-color:#CF1D1D;
-			padding:5px;			
-			color:white;
-			border:solid #9C1616 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-			width:40px;
-			font-size:7pt;
-			float:right;
-			margin-left:10px;
-		}
-		.cartContent a:hover {
-			background-color:#9C1616;
-			color:#CF1D1D;
-			color:white;		
-		}		
-		.cartFooter {
-			width:100%;
-			background-color:#E2E2E2;			
-			-moz-border-radius-bottomLeft:15px;
-			-moz-border-radius-bottomRight:15px;
-			margin:0px;			
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;				
-			text-align:center;
-		}
-		.cartFooter a {				
-			
-			background-color:#E2E2E2;
-			padding:5px;			
-			color:gray;
-			border:solid #F4F4F4 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-		}
-		.cartFooter a:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-		/* END OF cart CSS */
-
-/* SEARCH FILTER (Sort By)*/
-		.EMS_searchFilter {	
-			width:98%;
-			border:solid #E0E0E0 1px;			
-			font-size:9pt;
-			font-family:verdana;			
-			margin-top:2px;
-			-moz-box-sizing:border-box;			
-			background-color:#E2E2E2;
-			-moz-border-radius:15px;			
-			color:#808080;
-			height:58px;
-		}		
-		.EMS_searchFilter table {
-			float:right;
-			margin-right:5px;
-		}
-		.EMS_searchFilter td, .EMS_searchFilter select {
-			font-size:8pt;
-		}
-		.EMS_searchFilter input {				
-			background-color:#E2E2E2;
-			padding:5px;			
-			color:gray;
-			border:solid #F4F4F4 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-		}
-		.EMS_searchFilter input:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-		/* END SEARCH FILTER */
-</style>
-
-<link href="^Extras;/calendar/calendar-win2k-1.css" rel="stylesheet" type="text/css" />
diff --git a/docs/upgrades/templates-6.99.3/default-ems-template-event.tmpl b/docs/upgrades/templates-6.99.3/default-ems-template-event.tmpl
deleted file mode 100644
index ae6b4b906..000000000
--- a/docs/upgrades/templates-6.99.3/default-ems-template-event.tmpl
+++ /dev/null
@@ -1,455 +0,0 @@
-#EventManagerTmpl000002
-<div class="badge" style="width:100%"> 
-	<table cellpadding="3" cellspacing="0" style="width:100%">
-	<tr>
-		<td class="description" valign="top">
-			<h2 class="title"><tmpl_var title></h2>
-			<tmpl_var description>
-		</td>
-		<td rowspan="2" style="width:115px;align:center;" valign="top">
-			<h2 class="price"><tmpl_var price></h2>
-			
-			<a href="<tmpl_var title.url>">Search Eligible Events</a><br />
-			<tmpl_if canManageEvents>
-				<a title="Begin a Badge Purchase" style="cursor:pointer;" href="<tmpl_var purchase.url>">ADMIN Purchase</a>
-			<tmpl_else>
-				<tmpl_unless eventIsFull>
-					<a title="Begin a Badge Purchase" style="cursor:pointer;" href="<tmpl_var purchase.url>">Purchase</a>
-				<tmpl_else>
-					&nbsp;<br />
-				</tmpl_unless>
-			</tmpl_if>  			
-		</td>
-	</tr>
-	</table>
-</div>
-~~~
-<style type="text/css">
-
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-.manageEvents {
-	margin-top:5px;
-	margin-bottom:5px;
-}
-.datacardtitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:13px;
-}
-
-.leftnav{
-	padding: 1px 1px 1px 1px;
-	background: white;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.leftnavon{
-	padding: 1px 1px 1px 1px;
-	background: yellow;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.calendartitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-}
-.filter-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 105px;
-}
-.compare-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 76px;
-}
-.filter-text {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 114px;
-}
-.smLink {
-   font-family: verdana;
-   font-size: 10px;
-   font-weight: normal;
-   color: blue;
-}
-
-.StepLabel { font-family: Tahoma; font-size: 14pt; letter-spacing: 2pt; color: #234E9C; 
-               font-weight: bold }
-
-/* BADGE CSS */
-		.badge {
-			width:92%;
-			background-color:#F0F0F0;
-			-moz-border-radius:15px;
-			padding:5px;	
-			-moz-box-sizing:border-box;
-			font-family:verdana;
-			font-size:9pt;
-		}
-		.badge h2.title {
-			font-size:12.5pt;
-			background-color:#E2E2E2;
-			text-align:center;
-			-moz-border-radius-topLeft:15px;			
-			margin:0px;
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;
-			color:gray;	
-			margin-bottom:4px;
-		}
-		.badge h2.price {
-			font-size:12.5pt;			
-			text-align:center;
-			-moz-border-radius-topRight:15px;			
-			margin:0px;
-			border:solid #E2E2E2 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;
-			color:gray;	
-			margin-bottom:4px;
-		}
-		.badgeContent {
-			background-color:#F4F4F4;			
-			margin:0px;
-			margin-top:5px;
-			margin-bottom:5px;
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;
-			font-family:verdana;
-			font-size:9pt;
-		}
-		.badgeContent a, .badge a {
-			width:100px;
-			background-color:#E2E2E2;
-			padding:5px;			
-			color:gray;
-			border:solid silver 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-			font-size:7pt;
-			margin-left:10px;
-		}
-		.badgeContent a:hover, .badge a:hover {
-			background-color:#F0F0F0;
-			border-color:#E2E2E2;
-		}			
-		.badgeFooter {
-			width:100%;
-			background-color:#E2E2E2;			
-			-moz-border-radius-bottomLeft:15px;
-			-moz-border-radius-bottomRight:15px;
-			margin:0px;			
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;	
-			box-sizing:border-box;			
-			text-align:center;
-		}
-		.badgeFooter a {				
-			
-			background-color:#E2E2E2;
-			padding:5px;			
-			color:gray;
-			border:solid #F4F4F4 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-		}
-		.badgeFooter a:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-		.userData td {
-			background-color:#E2E2E2;
-			font-size:7pt;
-			-moz-border-radius:15px;
-			border:solid #F4F4F4 1px;
-			font-weight:bold;
-			
-		}
-		.userData td.data {
-			background-color:#F4F4F4;
-			border:solid #E2E2E2 1px;
-			font-weight:normal;
-		}	
-		/* END OF BADGE CSS */
-		
-		
-		
-		/* EVENT LIST CSS */
-		.eventList, .eventSearch {
-			border:solid #F0F0F0 1px;
-			padding:2px;
-			-moz-border-radius-topLeft:15px;
-			-moz-border-radius-topRight:15px;	
-			font-family:verdana;
-			font-size:9pt;
-		}
-		.eventList h2, .eventSearch h2 {
-			margin:0px;
-			font-family:verdana;
-			text-align:center;
-			font-size:12pt;
-			background-color: #F0F0F0;
-			color:black;
-			-moz-border-radius-topLeft:15px;
-			-moz-border-radius-topRight:15px;
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;						
-		}
-		.eventList {	
-			width:98%;
-			border:solid #E0E0E0 1px;			
-			font-size:9pt;
-			font-family:verdana;
-			/*background-color:#F4F4F4;*/
-			margin-top:2px;
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;
-		}
-		.event {			
-			font-size:9pt;
-			font-family:verdana;
-			background-color:#F4F4F4;
-			margin-top:2px;
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;		
-		}
-		.event td {
-			border-top:solid #E0E0E0 1px;
-			border-bottom:solid #E0E0E0 1px;
-			text-align:center;
-		}
-		.event th {
-			font-size:8pt;
-			text-align:center;
-			background:white;
-		}
-		.event td.left {
-			border-left:solid #E0E0E0 1px;
-		}
-		.event td.right {
-			border-right:solid #E0E0E0 1px;
-		}	
-		.event td.empty {
-			background-color:white;
-			border-style:none;
-			font-size:1px;
-		}
-		.event a {
-			background-color:#E2E2E2;
-			padding:5px;			
-			color:gray;
-			border:solid #F4F4F4 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;		
-			width:80%;
-		}
-		.event a:hover {
-			border: solid #E2E2E2 1px;
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-		/* END EVENT LIST CSS */
-		
-		
-		/* INSTRUCTIONS */
-		.instructions {
-			width:95%;
-			border:solid #F0F0F0 1px;
-			padding:5px;
-			-moz-border-radius-topLeft:15px;
-			-moz-border-radius-topRight:15px;	
-			font-family:verdana;
-			font-size:9pt;
-		}
-		/* END INSTRUCTIONS */
-
-		
-		/* SEARCH */
-		.eventSearch form {
-			margin:0px;
-		}
-		.eventSearch .searchBtn {
-			background-color:#E2E2E2;			
-			color:gray;
-			padding-top:1px;
-			padding-bottom:1px;
-			border:solid #F4F4F4 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;		
-		}
-		.searchBtn:hover {
-			border: solid #E2E2E2 1px;
-			background-color:#F0F0F0;
-			color:gray;		
-		}
-		.advSearch input, .advSearch select{
-			font-size:8pt;
-		}
-		.advSearch .button {
-			background-color:#CF1D1D;
-			padding-left:2px;			
-			padding-right:2px;			
-			color:white;
-			border:solid #9C1616 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-			width:30px;
-			font-size:10pt;			
-			margin-left:10px;	
-			height:100%;
-		}
-		.advSearch .button:hover {
-			background-color:#9C1616;
-			color:#CF1D1D;
-			color:white;		
-		}
-		.advSearch .compare-select {
-			width:75px;
-		}		
-		.advSearch .filter-text {
-			width:98%;
-		}
-		* html .advSearch .filter-text {
-			width:97%;
-		}
-		.advSearch tr.border td {
-			font-size:1pt;
-			background-color:#CFCFCF;
-		}
-		/* END SEARCH */
-/* cart CSS */
-		.cart {
-			width:92%;
-			background-color:#F0F0F0;
-			-moz-border-radius:15px;
-			padding:5px;	
-			-moz-box-sizing:border-box;
-			font-family:verdana;
-			font-size:9pt;
-		}
-		.cart h2 {
-			width:100%;
-			font-size:12.5pt;
-			background-color:#E2E2E2;
-			text-align:center;
-			-moz-border-radius-topLeft:15px;
-			-moz-border-radius-topRight:15px;
-			margin:0px;
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;
-			color:gray;			
-		}
-		.cartContent {
-			width:100%;
-			background-color:#F4F4F4;			
-			margin:0px;
-			margin-top:5px;
-			margin-bottom:5px;
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;
-			font-family:verdana;
-			font-size:9pt;
-		}
-		.cartContent a {
-			background-color:#CF1D1D;
-			padding:5px;			
-			color:white;
-			border:solid #9C1616 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-			width:40px;
-			font-size:7pt;
-			float:right;
-			margin-left:10px;
-		}
-		.cartContent a:hover {
-			background-color:#9C1616;
-			color:#CF1D1D;
-			color:white;		
-		}		
-		.cartFooter {
-			width:100%;
-			background-color:#E2E2E2;			
-			-moz-border-radius-bottomLeft:15px;
-			-moz-border-radius-bottomRight:15px;
-			margin:0px;			
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;	
-			box-sizing:border-box;			
-			text-align:center;
-		}
-		.cartFooter a {				
-			
-			background-color:#E2E2E2;
-			padding:5px;			
-			color:gray;
-			border:solid #F4F4F4 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-		}
-		.cartFooter a:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-		/* END OF cart CSS */
-
-</style>
-
-<link href="^Extras;/calendar/calendar-win2k-1.css" rel="stylesheet" type="text/css" />
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.3/default-ems-template-manage-purchases.tmpl b/docs/upgrades/templates-6.99.3/default-ems-template-manage-purchases.tmpl
deleted file mode 100644
index fcb977f48..000000000
--- a/docs/upgrades/templates-6.99.3/default-ems-template-manage-purchases.tmpl
+++ /dev/null
@@ -1,44 +0,0 @@
-#EventManagerTmpl000004
-<tmpl_if session.var.adminOn>
-        <p><tmpl_var controls></p><br /><br />
-</tmpl_if>
-<h2><tmpl_var managePurchasesTitle></h2>
-<table width="100%" cellspacing="2" cellpadding="2" class="EMS_purchase">
-<tr class="header">
-	<td><tmpl_var purchaseId.label></td>
-	<td><tmpl_var datePurchasedHuman.label></td>
-</tr>
-<tmpl_if purchasesLoop>
-	<tmpl_loop purchasesLoop>
-	<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>>
-		<td>&nbsp;<a href="<tmpl_var purchaseUrl>"><tmpl_var purchaseId></a></td>
-		<td>&nbsp;<tmpl_var datePurchasedHuman></td>
-	</tr>
-	</tmpl_loop>
-<tmpl_else>
-<tr>
-	<td><tmpl_var noPurchasesMessage></td>
-</tr>
-</tmpl_if>
-</table>
-~~~
-<style type="text/css">
-tr.oddRow td {
-	background-color:#FFF;	
-}
-tr.evenRow td {
-	background-color:#DADADA;	
-}
-.EMS_purchase {
-	font-size:9pt;
-	font-family:arial;
-	border:solid #E0E0E0 1px;
-	color:black;
-}
-.EMS_purchase tr.header td {
-	background-color:#E2E2E2;
-	color:#808080;
-	font-size:10pt;
-	font-weight:bold;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.3/default-ems-template-view-purchase.tmpl b/docs/upgrades/templates-6.99.3/default-ems-template-view-purchase.tmpl
deleted file mode 100644
index cd1d5be0f..000000000
--- a/docs/upgrades/templates-6.99.3/default-ems-template-view-purchase.tmpl
+++ /dev/null
@@ -1,130 +0,0 @@
-#EventManagerTmpl000005
-<script>
-function confirmDelete(url) {
-if(confirm("Are you sure you wish to delete ALL registrations tied to this purchaseId?")) {
-location.href=url;
-}
-}
-</script>
-
-<tmpl_if session.var.adminOn>
-        <p><tmpl_var controls></p><br /><br />
-</tmpl_if>
-<h2><tmpl_var viewPurchaseTitle></h2>
-
-<tmpl_if canReturn><tmpl_if canReturnTransaction>
-	<div style="text-align:right;">
-		(<a href="<tmpl_var appUrl>?func=returnItem;tid=<tmpl_var transactionId>">Return Entire Purchase</a>)
-	</div>
-</tmpl_if></tmpl_if>
-
-<tmpl_loop purchasesLoop>
-<table width="100%" border="0" class="viewPurchase">
-<tr>
-	<td class="badgeTitle">Badge Name</td>
-	<td class="itinerary">
-	Itinerary&nbsp;&nbsp;<tmpl_if canReturn><tmpl_if canReturnItinerary>(<a href="<tmpl_var appUrl>?func=returnItem;pid=<tmpl_var purchaseId>">Return Entire Itinerary</a>)</tmpl_if></tmpl_if>
-	</td>
-</tr>
-<tr>
-	<td class="badgeName" valign="top">
-		<tmpl_var firstName> <tmpl_var lastName><br /><tmpl_if canReturn><a href="<tmpl_var appUrl>?func=editRegistrant;badgeId=<tmpl_var badgeId>"><img src="/extras/toolbar/bullet/edit.gif" border="0" /></a></tmpl_if><br />
-		<a href="<tmpl_var appUrl>?func=viewPurchase;badgeId=<tmpl_var badgeId>">View All Registrations for this Registrant</a>
-<br /><br /><tmpl_unless registrantView>
-<tmpl_if purchaseEventId><tmpl_if canAddEvents><tmpl_if canReturnItinerary><a href="<tmpl_var appUrl>?func=addEventsToBadge;bid=<tmpl_var badgeId>;eventId=<tmpl_var purchaseEventId>">Add Events To Badge</a><tmpl_else>Returned</tmpl_if></tmpl_if></tmpl_if>
-</tmpl_unless>
-	</td>
-	<td valign="top">
-		<table width="100%">
-		<tr>
-			<td><strong>Event Title</strong></td>
-			<td><strong>Event Dates</strong></td>
-		<tmpl_if canReturn>
-			<td><strong>Return Registration</strong></td>
-		</tmpl_if>
-		</tr>
-	<tmpl_loop regLoop>
-		<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>>
-			<td><tmpl_var sku>: <tmpl_var title></td>
-			<td><tmpl_var startDateHuman> - <tmpl_var endDateHuman></td>
-		<tmpl_if canReturn>
-			<td><tmpl_if returned>RETURNED<tmpl_else><a href="<tmpl_var appUrl>?func=returnItem;rid=<tmpl_var registrationId>">Return This Registration</a></tmpl_if></td>
-		</tmpl_if>
-		</tr>
-	</tmpl_loop>
-		</table>
-	</td>
-</tr>
-</table>
-</tmpl_loop>
-
-<br /><br />
-<tmpl_if hasIncompleteTransactions>
-
-<table width="100%">
-<tr><td colspan="6" align="center"><h2>Unpurchased Registrations</h2></td></tr>
-<tr><td colspan="6">Badge Id: <tmpl_var badgeId></td></tr>
-<tr><td height="10" colspan="6">&nbsp;</td></tr>
-<tr><th>Event Number</th>
-    <th>Title</th>
-    <th>RegistrationId</th>
-    <th>Returned</th>
-    <th>Transaction Id</th>
-    <th>Status</th>
-</tr>
-
-<tmpl_loop incompleteTransactions_loop>
-<tr><td height="10" colspan="6">&nbsp;</td></tr>
-<tr><td colspan="4" bgcolor="#a0a0a0">Purchase Id: <tmpl_var purchaseId>
-<tmpl_if canDeleteRegistration>
-<br/>
-<a href="javascript:void(confirmDelete('<tmpl_var deleteRegistration.url>'));"><tmpl_var deleteRegistration.label></a>
-</tmpl_if>
-</td>
-<td bgcolor="#a0a0a0"><tmpl_var form.header><tmpl_var form.transactionSelect></td><td bgcolor="#a0a0a0"><tmpl_var form.submit><tmpl_var form.footer></td></tr>
-  <tmpl_loop unpurchased_loop>
-   <tr 
-   <tmpl_if __ODD__>bgcolor="#e0e0e0"
-   <tmpl_else>bgcolor="#c0c0c0"
-</tmpl_if>
->
-   <td><tmpl_var sku></td>
-   <td><tmpl_var title></td>
-   <td><tmpl_var registrationId></td> 
-   <td align="center"><tmpl_var returned></td>
-   <td><tmpl_var transactionId></td>
-   <td><tmpl_var transactioStatus></td> 
-   </tr>
-  </tmpl_loop>
-</tmpl_loop>
-</table>
-</tmpl_if>
-~~~
-<style type="text/css">
-.viewPurchase {
-	border-bottom:solid silver 2px;
-}
-.viewPurchase td {
-	font-size:10pt;
-}
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-td.badgeTitle, td.itinerary   {
-	font-size:9pt;
-	font-weight:bold;	
-	border-bottom:solid gray 1px;
-}
-td.badgeName {
-	font-size:9pt;
-	font-style:italic;
-}
-h2 {
-	margin-bottom:3px;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.3/default_ems_template.tmpl b/docs/upgrades/templates-6.99.3/default_ems_template.tmpl
deleted file mode 100644
index 115882729..000000000
--- a/docs/upgrades/templates-6.99.3/default_ems_template.tmpl
+++ /dev/null
@@ -1,276 +0,0 @@
-#EventManagerTmpl000001
-
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if session.var.adminOn>
-        <p><tmpl_var controls></p><br /><br />
-</tmpl_if>
-
-<table cellpadding="3" cellspacing="0" style="width:98%" class="EMS_view">
-<tr>
-	<td valign="top">
-
-		<tmpl_if canManageEvents>
-		<br />
-		<table cellpadding="5" cellspacing="0" style="width:100%">
-		<tr style="height:30px;">
-			<td valign="top" style="width:190px;"><a href="<tmpl_var manageEvents.url>">Manage Events</a></td>
-			<td>(Event Directors and Staff)</td>
-		</tr>
-		<tr style="height:30px">
-			<td valign="top" style="width:190px;"><a href="<tmpl_var manageRegistrants.url>">Manage Registrants</a></td>
-			<td>(Event Directors and Staff)</td>
-		</tr>
-		</tmpl_if>
-		
-		<tr style="height:30px">
-			<td valign="top" style="width:190px;"><a href="<tmpl_var managePurchases.url>">Modify Existing Badge</a></td>
-			<td>Add Events to a Badge you've already purchased</td>
-		</tr>
-		</table>
-	</td>
-	<td style="width:250px" valign="top" align="center">
-
-		<tmpl_if cart.purchaseLoop>
-		<div class="cart">
-			<h2>Shopping Cart</h2>
-			
-			<tmpl_loop cart.purchaseLoop>
-			<div class="cartContent">
-				<table border="0" cellpadding="0" cellspacing="0" width="100%">
-				<tbody>
-				<tr>
-					<td>
-						<b><tmpl_var purchase.mainEventTitle></b><br />
-						<tmpl_loop registrantInfoLoop>
-							Name: <tmpl_var firstName> <tmpl_var lastName>
-						</tmpl_loop>
-						<br />
-						Additional Price: $<tmpl_var newPrice> 					
-					</td>
-				</tr>
-				<tr>
-					<td style="border-top:solid silver 1px;">
-						<a href="<tmpl_var edit.url>" class="button"><img src="^Extras;/toolbar/bullet/edit.gif" style="border-style:none" /></a>
-						<a href="<tmpl_var delete.url>" class="button"><img src="^Extras;/toolbar/bullet/delete.gif" style="border-style:none" /></a>
-					</td>
-				</tr>
-				</tbody>
-				</table>				
-			</div>
-			</tmpl_loop>
-			
-			<a href="<tmpl_var emptyCart.url>">Empty Cart</a><br /><a href="<tmpl_var checkout.url>">Checkout</a>
-		</div>
-		</tmpl_if>
-	</td>
-</tr>
-</table>
-<br />
-
-<div>
-	<span class="StepLabel">Step 1: </span> Choose a badge from the list below, or click the link above to add events to a badge you've already purchased.
-</div>
-<br />
-
-<table width="100%" border="0" cellpadding="8" cellspacing="0">
-<tmpl_loop events_loop>
-<tr>
-	<td valign="top" colspan="7"><tmpl_var event></td>
-</tr>
-</tmpl_loop>
-</table>
-<tmpl_var paginateBar>
-~~~
-
-<style type="text/css">
-.EMS_view {
-	background-color:#F4F4F4;
-	border:solid #E2E2E2 1px;
-	-moz-border-radius:15px;
-}
-.EMS_view a {
-	width:200px;
-	background-color:#E2E2E2;
-	padding:5px;			
-	color:gray;
-	border:solid silver 1px;
-	text-decoration:none;
-	font-weight:bold;						
-	text-align:center;
-	-moz-border-radius:10px;
-	display:block;
-	font-size:7pt;
-	margin-left:10px;
-	-moz-box-sizing:border-box;
-}
-.EMS_view a:hover {
-	background-color:#F0F0F0;
-	border-color:#E2E2E2;
-}
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-.manageEvents {
-	margin-top:5px;
-	margin-bottom:5px;
-}
-.datacardtitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:13px;
-}
-
-.leftnav{
-	padding: 1px 1px 1px 1px;
-	background: white;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.leftnavon{
-	padding: 1px 1px 1px 1px;
-	background: yellow;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.calendartitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-}
-.filter-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 105px;
-}
-.compare-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 76px;
-}
-.filter-text {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 114px;
-}
-.smLink {
-   font-family: verdana;
-   font-size: 10px;
-   font-weight: normal;
-   color: blue;
-}
-
-.StepLabel { font-family: Tahoma; font-size: 14pt; letter-spacing: 2pt; color: #234E9C; 
-               font-weight: bold }
-		.cart {			
-			background-color:#F0F0F0;
-			-moz-border-radius:15px;
-			padding:5px;	
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;
-			font-family:verdana;
-			font-size:9pt;
-			border:solid #E2E2E2 1px;
-			margin-right:10px;
-			text-align:left;
-		}
-		.cart h2 {
-			width:100%;
-			font-size:12.5pt;
-			background-color:#E2E2E2;
-			text-align:center;
-			-moz-border-radius-topLeft:15px;
-			-moz-border-radius-topRight:15px;
-			margin:0px;
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;
-			color:gray;			
-		}
-		.cartContent {			
-			background-color:#F4F4F4;			
-			margin:0px;
-			margin-top:5px;
-			margin-bottom:5px;
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;
-			font-family:verdana;
-			font-size:9pt;
-		}
-		.cartContent a.button {
-			background-color:#CF1D1D;
-			padding:5px;			
-			color:white;
-			border:solid #9C1616 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			font-size:7pt;			
-			margin-left:10px;
-			margin-top:2px;
-			width:auto;	
-			display:block;
-			float:right;
-		}
-		.cartContent a.button:hover {
-			background-color:#9C1616;
-			color:#CF1D1D;
-			color:white;		
-		}		
-		.cartFooter {
-			width:100%;
-			background-color:#E2E2E2;			
-			-moz-border-radius-bottomLeft:15px;
-			-moz-border-radius-bottomRight:15px;
-			margin:0px;			
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;	
-			box-sizing:border-box;			
-			text-align:center;
-		}
-		.cartFooter a {				
-			
-			background-color:#E2E2E2;
-			padding:5px;			
-			color:gray;
-			border:solid #F4F4F4 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-		}
-		.cartFooter a:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.3/default_ems_template_checkout.tmpl b/docs/upgrades/templates-6.99.3/default_ems_template_checkout.tmpl
deleted file mode 100644
index 24e8245d5..000000000
--- a/docs/upgrades/templates-6.99.3/default_ems_template_checkout.tmpl
+++ /dev/null
@@ -1,106 +0,0 @@
-#EventManagerTmpl000003
-<tmpl_if resolveConflicts>
-<tmpl_var form.header>
-<table width="100%" border="0">
-<tr><td><tmpl_var message></td></tr>
-
-<tr>
-	<td>
-		<table width="100%">
- <tmpl_loop conflict_loop>
-		<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>>
-			<td><tmpl_var form.deleteControl></td>
-			<td><tmpl_var title></td>
-			<td><tmpl_var description></td>
-			<td><tmpl_var price></td>
-		</tr>
- </tmpl_loop>
-		</table>
-	</td>
-</tr> 
-<tr><td><tmpl_var form.submit></td></tr>
-</table>
-<tmpl_var form.footer>
-</tmpl_if>
-
-
-
-
-<tmpl_if registration>
-  <tmpl_var form.header>
-  <tmpl_var form.message>
-  <tmpl_var form.chooserJS>
-  <table style="border-top:solid gray 1px;width:100%;margin-top:5px;">
-<tmpl_if form.badgeId><tr><td><tmpl_var form.badgeId.label></td><td><tmpl_var form.badgeId></td></tr></tmpl_if>
-  <tr><td><tmpl_var form.firstName.label></td><td><tmpl_var form.firstName></td></tr>
-<tr><td><tmpl_var form.lastName.label></td><td><tmpl_var form.lastName></td></tr>
-<tr><td><tmpl_var form.address.label></td><td><tmpl_var form.address></td></tr>
-<tr><td><tmpl_var form.city.label></td><td><tmpl_var form.city></td></tr>
-<tr><td><tmpl_var form.state.label></td><td><tmpl_var form.state></td></tr>
-<tr><td><tmpl_var form.zipcode.label></td><td><tmpl_var form.zipcode></td></tr>
-<tr><td><tmpl_var form.country.label></td><td><tmpl_var form.country></td></tr>
-<tr><td><tmpl_var form.phoneNumber.label></td><td><tmpl_var form.phoneNumber></td></tr>
-<tr><td><tmpl_var form.email.label></td><td><tmpl_var form.email></td></tr>
-<tr><td colspan="2"><br /><tmpl_var form.submit></td></tr>
-</table>
-<script type="text/javascript">
-
-function swapBadgeInfo(badgeId) {
-	var selector = document.getElementById('badgeId_formId');
-	for (var i in badges[badgeId]) {
-		var field = document.getElementById(i+'_formId');
-		if (field && badges[badgeId][i]) {
-			field.value=badges[badgeId][i];
-		} else {
-			if (field) field.value='';
-		}
-	}
-}	
-
-var selector1 = document.getElementById('badgeId_formId');
-if (selector1) {
-	swapBadgeInfo(selector1.value);
-}
-
-</script>
-<tmpl_var form.footer>
-</tmpl_if>
-
-<tmpl_if prereqsAreMissing>
-<tmpl_var form.header>
-<table border="1">
-
-<tmpl_loop message_loop>
-<tr>
-	<td colspan="4"><strong><tmpl_var title> requires all of the following:</strong></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<ul>
-<tmpl_loop messageLoop>
-			<li><tmpl_var reqmessage></li>
-</tmpl_loop>
-		</ul>
-	</td>
-</tr>
-</tmpl_loop>
-
-<tmpl_loop missingEvents_loop>
-<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>><td><tmpl_var form.checkBox></td><td><tmpl_var title></td><td><tmpl_var description></td><td><tmpl_var price></td></tr>
-</tmpl_loop>
-<tr><td colspan="4"><br /><tmpl_var form.submit></td></tr>
-</table>
-<tmpl_var form.footer>
-
-</tmpl_if>
-~~~
-<style type="text/css">
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.3/faq.tmpl b/docs/upgrades/templates-6.99.3/faq.tmpl
deleted file mode 100644
index 4b0cc459c..000000000
--- a/docs/upgrades/templates-6.99.3/faq.tmpl
+++ /dev/null
@@ -1,71 +0,0 @@
-#PBtmpl0000000000000080
-
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		<tmpl_if pagination.pageCount.isMultiple>
-			&bull;
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-	</tmpl_if>
-</p>
-
-<ul>
-	<tmpl_loop post_loop>
-	   <li><a href="#id<tmpl_var assetId>"><span class="faqQuestion"><tmpl_var title></span></a></li>
-	</tmpl_loop>
-</ul>
-
-<tmpl_loop post_loop>
-	<tmpl_if user.isPoster>
-		<tmpl_unless session.var.adminOn>
-			<div>[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]</div>
-		</tmpl_unless>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<div>
-			<tmpl_if session.var.adminOn>
-				<tmpl_var controls>
-			<tmpl_else>
-				<tmpl_unless user.isPoster>
-					<tmpl_unless session.var.adminOn>
-						[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-					</tmpl_unless>
-				</tmpl_unless>
-			</tmpl_if>
-			(<a href="<tmpl_var url>"><tmpl_var status></a>)
-		</div>
-	</tmpl_if>
-	<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a><span class="faqQuestion"><tmpl_var title></span><br />
-	<tmpl_var content>
-	<p><a href="#top">[top]</a></p>
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage>  &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.3/guest_book.tmpl b/docs/upgrades/templates-6.99.3/guest_book.tmpl
deleted file mode 100644
index 4fc78fa4b..000000000
--- a/docs/upgrades/templates-6.99.3/guest_book.tmpl
+++ /dev/null
@@ -1,49 +0,0 @@
-#PBtmpl0000000000000133
-
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		<tmpl_if pagination.pageCount.isMultiple>
-			&bull;
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-	</tmpl_if>
-</p>
-
-<tmpl_loop post_loop>
-
-<div><b>On <tmpl_var dateSubmitted.human> <a href="<tmpl_var userProfile.url>"><tmpl_var username></a> from <a href="<tmpl_var url>">the '<tmpl_var title>' department</a> wrote</b></div>
-<div><i><tmpl_var synopsis></i></div>
-<div><a href="<tmpl_var url>"><tmpl_var readmore.label></a></div>
-<p />
-
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.3/link_list.tmpl b/docs/upgrades/templates-6.99.3/link_list.tmpl
deleted file mode 100644
index 862c0bfec..000000000
--- a/docs/upgrades/templates-6.99.3/link_list.tmpl
+++ /dev/null
@@ -1,66 +0,0 @@
-#PBtmpl0000000000000083
-
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		<tmpl_if pagination.pageCount.isMultiple>
-			&bull;
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-	</tmpl_if>
-</p>
-
-<tmpl_loop post_loop>
-	<tmpl_if user.isPoster>
-		<tmpl_unless session.var.adminOn>
-			[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]&nbsp;
-		</tmpl_unless>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-			<tmpl_if session.var.adminOn>
-				<tmpl_var controls>
-			<tmpl_else>
-				<tmpl_unless user.isPoster>
-					<tmpl_unless session.var.adminOn>
-						[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-					</tmpl_unless>
-				</tmpl_unless>
-			</tmpl_if>
-			(<a href="<tmpl_var url>"><tmpl_var status></a>)
-	</tmpl_if>
-	<p>
-		<tmpl_if userDefined1><a href="<tmpl_var userDefined1>"	<tmpl_if userDefined2>target="_blank"</tmpl_if>></tmpl_if><tmpl_var title><tmpl_if userDefined1></a></tmpl_if>
-		<tmpl_if content>
-				  - <tmpl_var content>
-		</tmpl_if>
-	</p>
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.3/ordered_list.tmpl b/docs/upgrades/templates-6.99.3/ordered_list.tmpl
deleted file mode 100644
index 10590daa2..000000000
--- a/docs/upgrades/templates-6.99.3/ordered_list.tmpl
+++ /dev/null
@@ -1,68 +0,0 @@
-#PBtmpl0000000000000101
-
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		<tmpl_if pagination.pageCount.isMultiple>
-			&bull;
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-	</tmpl_if>
-</p>
-
-<ol>
-	<tmpl_loop post_loop>
-		<li>
-			<tmpl_if user.isPoster>
-				<tmpl_unless session.var.adminOn>
-					[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-				</tmpl_unless>
-			</tmpl_if>
-			<tmpl_if user.isModerator>
-				<tmpl_if session.var.adminOn>
-					<tmpl_var controls>
-				<tmpl_else>
-					<tmpl_unless user.isPoster>
-						<tmpl_unless session.var.adminOn>
-							[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-						</tmpl_unless>
-					</tmpl_unless>
-				</tmpl_if>
-				(<a href="<tmpl_var url>"><tmpl_var status></a>)
-			</tmpl_if>
-			<tmpl_if userDefined1><a href="<tmpl_var userDefined1>"	<tmpl_if userDefined2>target="_blank"</tmpl_if>></tmpl_if><tmpl_var title><tmpl_if userDefined1></a></tmpl_if>
-			<tmpl_if content>
-					  - <tmpl_var content>
-			</tmpl_if>
-		</li>
-	</tmpl_loop>
-</ol>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.3/photo_gallery.tmpl b/docs/upgrades/templates-6.99.3/photo_gallery.tmpl
deleted file mode 100644
index 09a7de508..000000000
--- a/docs/upgrades/templates-6.99.3/photo_gallery.tmpl
+++ /dev/null
@@ -1,69 +0,0 @@
-#PBtmpl0000000000000121
-<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>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&#149;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&#149;
-	</tmpl_unless>
-	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-</p>
-
-<br />
-
-<tmpl_loop post_loop>
-	<div class="picture">
-		<div style="text-align: center;">
-			<tmpl_if user.isPoster><div>(<tmpl_var status>)</div></tmpl_if>
-			<div><a href="<tmpl_var url>"><img src="<tmpl_var thumbnail>" alt="<tmpl_var title>" /></a></div>
-			<div><a href="<tmpl_var url>"><tmpl_var title></a></div>
-		</div>
-	</div>
-</tmpl_loop>
-
-<div style="clear: both;"></div>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-.picture {
-	padding: 0px;
-	margin: 10px;
-	float: left;
-	font-size: 12px;
-	width: 150px;
-	height: 100px;
-}
-
-html > body .picture {
-height:auto;
-min-height:150px;
-width:auto;
-min-width:100px;
-}
-</style>
-
diff --git a/docs/upgrades/templates-6.99.3/q_and_a.tmpl b/docs/upgrades/templates-6.99.3/q_and_a.tmpl
deleted file mode 100644
index 11cf7e683..000000000
--- a/docs/upgrades/templates-6.99.3/q_and_a.tmpl
+++ /dev/null
@@ -1,107 +0,0 @@
-#PBtmpl0000000000000081
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p class="postControls">
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a> 
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if> 
-		<tmpl_if pagination.pageCount.isMultiple>
-			&bull;
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-	</tmpl_if>
-</p>
-
-<tmpl_loop post_loop>
-	<tmpl_if user.isPoster>
-		<tmpl_unless session.var.adminOn>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-		</tmpl_unless>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-
-			<tmpl_if session.var.adminOn>
-				<tmpl_var controls>
-			<tmpl_else>
-				<tmpl_unless user.isPoster>
-					<tmpl_unless session.var.adminOn>
-						<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull;
-					</tmpl_unless>
-				</tmpl_unless>
-			</tmpl_if>
-			(<a href="<tmpl_var url>"><tmpl_var status></a>)<br />
-
-	</tmpl_if>
-	<p class="posts">
-		<b>Q: <tmpl_var title></b>
-		A: <tmpl_var content>
-	</p>
-	<p />
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-.postControls
-{
-	background:#676767;
-	color:#C0C0C0;
-	width:95%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-}
-
-.postControls a
-{
-	color:white;
-	font-size:8pt;
-	text-decoration:underline;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.posts
-{
-	width:95%;
-	border:solid 1px gray;
-	padding:3px;
-	font-family:arial;
-}
-
-.posts b
-{
-	-moz-box-sizing:border-box;
-	background-color:silver;
-	width:100%;
-	display:block;
-	padding:3px;
-	margin-bottom:3px;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.3/topics.tmpl b/docs/upgrades/templates-6.99.3/topics.tmpl
deleted file mode 100644
index 704a65814..000000000
--- a/docs/upgrades/templates-6.99.3/topics.tmpl
+++ /dev/null
@@ -1,119 +0,0 @@
-#PBtmpl0000000000000079
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p class="postControls">
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		&nbsp;[<a href="<tmpl_var search.url>"><tmpl_var search.label></a>]
-	</tmpl_if>
-</p>
-
-<tmpl_loop post_loop>
-	<tmpl_if user.isPoster>
-		<tmpl_unless session.var.adminOn>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-		</tmpl_unless>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-			<tmpl_if session.var.adminOn>
-				<tmpl_var controls>
-			<tmpl_else>
-				<tmpl_unless user.isPoster>
-					<tmpl_unless session.var.adminOn>
-						<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull;
-					</tmpl_unless>
-				</tmpl_unless>
-			</tmpl_if>
-			(<a href="<tmpl_var url>"><tmpl_var status></a>)
-	</tmpl_if><br />
-	<h2 class="topicsTitle"><tmpl_var title></h2>
-	<span class="topicContent"><tmpl_var content></span>
-	<p />
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-.postControls
-{
-	background:#676767;
-	color:#C0C0C0;
-	width:95%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-}
-.postControls a
-{
-	color:white;
-	font-size:8pt;
-	text-decoration:underline;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.pagination
-{
-	-moz-box-sizing:border-box;
-	background:#676767;
-	width:95%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-}
-.pagination a
-{
-	color:white;
-	font-size:8pt;
-}
-.pagination a:hover {
-	text-decoration:none;
-}
-.topicsTitle
-{
-	-moz-box-sizing:border-box;
-	width:95%;
-	border-bottom:solid silver 1px;
-	margin-bottom:3px;
-	font-family:arial;
-}
-
-.topicContent
-{
-	-moz-box-sizing:border-box;
-	font-family:arial;
-	font-size:9pt;
-	width:95%;
-	display:block;
-	border:solid silver 1px;
-	padding:3px;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.3/traditional_with_thumbnails.tmpl b/docs/upgrades/templates-6.99.3/traditional_with_thumbnails.tmpl
deleted file mode 100644
index de13cfd1c..000000000
--- a/docs/upgrades/templates-6.99.3/traditional_with_thumbnails.tmpl
+++ /dev/null
@@ -1,137 +0,0 @@
-#PBtmpl0000000000000097
-
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p class="pagination">
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&bull;
-	</tmpl_unless>
-	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-</p>
-
-<table width="100%">
-<tr>
-	<tmpl_if user.isModerator>
-		<td class="forumHead"><tmpl_var status.label></td>
-	</tmpl_if>
-	<td class="forumHead"><a href="<tmpl_var sortby.title.url>"><tmpl_var title.label></a></td>
-	<td class="forumHead"><tmpl_var thumbnail.label></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.date.url>"><tmpl_var date.label></a></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.username.url>"><tmpl_var by.label></a></td>
-</tr>
-<tmpl_loop post_loop>
-	<tr>
-		<tmpl_if user.isModerator>
-			<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var status></td>
-		</tmpl_if>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a><tmpl_if user.isPoster> (<tmpl_var status>)</tmpl_if></td>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" style="text-align: center;">
-			<tmpl_if thumbnail>
-				 <a href="<tmpl_var url>"><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var title>" /></a>
-			<tmpl_else>
-				 &nbsp;
-			</tmpl_if>
-		</td>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateUpdated.human></td>
-		<tmpl_if user.isVisitor>
-			<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var username></td>
-		<tmpl_else>
-			<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var userProfile.url>"><tmpl_var username></a></td>
-		</tmpl_if>
-	</tr>
-</tmpl_loop>
-</table>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<br />
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-.forumHead {
-	background-color: #DADADA;
-	border: 2px solid #cccccc;
-	padding: 2px;
-	padding-bottom: 4px;
-	font-size: 13px;
-	font-weight: bold;
-	font-family:arial;
-}
-
-.oddThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #83cc83;
-	padding-bottom: 4px;	
-	font-family:arial;
-}
-
-.forumHead a
-{
-	color:#29587E;
-}
-
-.oddThread a
-{
-	color:#29587E;
-}
-
-.evenThread a
-{
-	color:#29587E;
-}
-
-.evenThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #aaaaff;
-	padding-bottom: 4px;
-	background-color:#EEEEEE;
-	font-family:arial;
-}
-.pagination {
-	-moz-box-sizing:border-box;
-	background:#676767;
-	color:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-}
-.pagination a {
-	color:white;
-	font-size:8pt;
-	text-decoration:underline;
-}
-
-.pagination a:hover {
-	text-decoration:none;
-}
-
-h2
-{
-	font-family:arial;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.3/unordered_list.tmpl b/docs/upgrades/templates-6.99.3/unordered_list.tmpl
deleted file mode 100644
index 14e8ed96c..000000000
--- a/docs/upgrades/templates-6.99.3/unordered_list.tmpl
+++ /dev/null
@@ -1,103 +0,0 @@
-#PBtmpl0000000000000082
-
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p class="pagination">
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		
-		<tmpl_if pagination.pageCount.isMultiple>
-			&bull;
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-	</tmpl_if>
-</p>
-
-<ul class="unorderedList">
-	<tmpl_loop post_loop>
-		<li>
-			<tmpl_if user.isPoster>
-				<tmpl_unless session.var.adminOn>
-					[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-				</tmpl_unless>
-			</tmpl_if>
-			<tmpl_if user.isModerator>
-				<tmpl_if session.var.adminOn>
-					<tmpl_var controls>
-				<tmpl_else>
-					<tmpl_unless user.isPoster>
-						<tmpl_unless session.var.adminOn>
-							[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-						</tmpl_unless>
-					</tmpl_unless>
-				</tmpl_if>
-				(<a href="<tmpl_var url>"><tmpl_var status></a>)
-			</tmpl_if>
-			<tmpl_if userDefined1><a href="<tmpl_var userDefined1>"	<tmpl_if userDefined2>target="_blank"</tmpl_if>></tmpl_if><tmpl_var title><tmpl_if userDefined1></a></tmpl_if>
-			<tmpl_if content>
-					  - <tmpl_var content>
-			</tmpl_if>
-		</li>
-	</tmpl_loop>
-</ul>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage>  &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-.pagination {
-	-moz-box-sizing:border-box;
-	background:#676767;
-	color:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-}
-.pagination a {
-	color:white;
-	font-size:8pt;
-	text-decoration:underline;
-}
-
-.pagination a:hover {
-	text-decoration:none;
-}
-
-.unorderedList
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-h2
-{
-	font-family:arial;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.3/weblog.tmpl b/docs/upgrades/templates-6.99.3/weblog.tmpl
deleted file mode 100644
index 0c434ac21..000000000
--- a/docs/upgrades/templates-6.99.3/weblog.tmpl
+++ /dev/null
@@ -1,124 +0,0 @@
-#PBtmpl0000000000000112
-
-<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>
-</tmpl_if>
-
-<p class="pagination">
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&bull;
-	</tmpl_unless>
-	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-</p>
-
-<p />
-
-<tmpl_loop post_loop>
-	<div class="weblogTitleBar">
-		<tmpl_var title>
-	</div>
-	<fieldset class="weblogSynopsis">
-		<legend class="weblogLegend" align="left">
-			<tmpl_var by.label> <a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-			-
-			<tmpl_var dateSubmitted.human>
-			<tmpl_if replies>
-				- <tmpl_var replies> <tmpl_var replies.label>
-			</tmpl_if>
-			<tmpl_if user.isPoster>
-				 - <tmpl_var status>
-			<tmpl_else>
-				<tmpl_if user.isModerator>
-					- <tmpl_var status>
-				</tmpl_if>
-			</tmpl_if>
-		</legend>
-		<tmpl_if thumbnail>
-			<a href="<tmpl_var url>"><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var title>" align="right" /></a>
-		</tmpl_if>
-		<tmpl_var synopsis>
-		<div class="weblogReadMore">
-			<a href="<tmpl_var url>"><tmpl_var readmore.label></a>
-		</div>
-	</fieldset>
-	<p />
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &bull; <tmpl_var pagination.pageList.upTo10> &bull; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-.pagination {
-	-moz-box-sizing:border-box;
-	background:#676767;
-	color:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-}
-.pagination a {
-	color:white;
-	font-size:8pt;
-	text-decoration:underline;
-}
-
-.pagination a:hover {
-	text-decoration:none;
-}
-
-.weblogTitleBar {
-	font-weight: bold;
-	font-size: 14px;
-	font-family:arial;
-}
-
-.weblogLegend {
-	font-size: 9px;
-	color: #999999;
-	font-family:arial;
-}
-
-.weblogLegend a
-{
-	color:#29587E;
-}
-
-.weblogReadMore {
-	text-align: right;
-	font-size: 9px;
-	width: 100%;
-	font-family:arial;
-}
-
-.weblogSynopsis {
-	border: 1px solid #bbbbbb;
-	font-size: 13px;
-	padding: 5px;
-	-moz-border-radius: 6px;
-	font-family:arial;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.3/wgtemplate_default_forum_notification.tmpl b/docs/upgrades/templates-6.99.3/wgtemplate_default_forum_notification.tmpl
deleted file mode 100644
index dacf247b2..000000000
--- a/docs/upgrades/templates-6.99.3/wgtemplate_default_forum_notification.tmpl
+++ /dev/null
@@ -1,46 +0,0 @@
-#PBtmpl0000000000000027
-<table border="0" cellpadding="3" cellspacing="2">
-<tbody>
-<tr>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor="black" style="background-color:black;"><font color="white"><b style="color:white;"><tmpl_var username> has posted to one of your subscriptions</b></font></td>
-</tr>
-<tr>
-	<td bgcolor="#DFDFDF" style="background-color:#DFDFDF;"><a href="<tmpl_var url>"><font color="black"><tmpl_var url></a></td>
-</tr>
-<tr>
-	<td bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var content></td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tmpl_if userDefined1>
-<tr>
-	<td bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var userDefined1></td>
-</tr>
-</tmpl_if>
-<tmpl_if userDefined2>
-<tr>
-	<td bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var userDefined2></td>
-</tr>
-</tmpl_if>
-<tmpl_if userDefined3>
-<tr>
-	<td bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var userDefined3></td>
-</tr>
-</tmpl_if>
-<tmpl_if userDefined4>
-<tr>
-	<td bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var userDefined4></td>
-</tr>
-</tmpl_if>
-<tmpl_if userDefined5>
-<tr>
-	<td bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var userDefined5></td>
-</tr>
-</tmpl_if>
-</tbody>
-</table>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.3/wgtemplate_default_pm_view.tmpl b/docs/upgrades/templates-6.99.3/wgtemplate_default_pm_view.tmpl
deleted file mode 100644
index 7b1efd33e..000000000
--- a/docs/upgrades/templates-6.99.3/wgtemplate_default_pm_view.tmpl
+++ /dev/null
@@ -1,145 +0,0 @@
-#ProjectManagerTMPL0001
-<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>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<script>
-   function doDelete(url) {
-      if( confirm('<tmpl_var project.delete.warning>') ) {
-	     location.href=url;
-	  }
-   }
-</script>
-
-<table cellpadding="3" cellspacing="0" border="0" class="projectView">
-   <tr>
-	   <td colspan="3" style="border-style:none;text-align:left;" valign="bottom">
-		   <tmpl_if canEditProjects><a href="<tmpl_var project.create>"><tmpl_var project.create.label></a><tmpl_else>&#160;</tmpl_if>
-	   </td>
-	   <td style="border-style:none;text-align:right" colspan="3">
-	      <form action="" style="margin:0px;">
-		     <p style="margin:0px;">
-			    <select>
-				   <option>All Projects</option>
-				</select>			
-			 </p>
-		  </form>
-	   </td>
-    </tr>
-
-    <tr class="header">
-	   <td><tmpl_var project.name.label></td>
-	   <td><tmpl_var project.startDate.label></td>
-	   <td><tmpl_var project.endDate.label></td>
-	   <td><tmpl_var project.cost.label></td>
-	   <td><tmpl_var project.complete.label></td>
-	   <tmpl_if canEditProjects>
-	      <td><tmpl_var project.actions.label></td>
-	   </tmpl_if>
-    </tr>
-	<tmpl_if noProjects>
-	   <tr><td class="projectNames" colspan="<tmpl_var empty.colspan>"><tmpl_var noProjects></td></tr>
-	<tmpl_else>
-	   <tmpl_loop project.loop>
-	      <tr class="alt">
-	         <td class="projectNames">
-			    <a href="<tmpl_var project.view.url>"><tmpl_var project.name.data></a>
-			 </td>
-	         <td><tmpl_var project.startDate.data></td>
-	         <td><tmpl_var project.endDate.data></td>
-	         <td><tmpl_var project.cost.data.int></td>
-	         <td>
-		        <div class="completeContainer">
-			       <div class="completeBar" style="width:<tmpl_var project.complete.data.int>%;"></div>
-			       <div class="completeText"><tmpl_var project.complete.data.float>%</div>
-		        </div>	
-	         </td>
-			 <tmpl_if canEditProjects>
-	            <td>
-			        <!-- <a href="#"><img src="<tmpl_var extras>/add.gif" style="border-style:none;" alt="" /></a>&nbsp; -->
-				   <a href="<tmpl_var project.edit.url>"><img src="<tmpl_var extras>/edit.gif" style="border-style:none;" title="<tmpl_var project.edit.title>" /></a>&nbsp;
-				   <a href="javascript:void(doDelete('<tmpl_var project.delete.url>'));"><img src="<tmpl_var extras>/delete.gif" style="border-style:none;" title="<tmpl_var project.delete.title>" /></a>
-			    </td>
-             </tmpl_if>
-		  </tr>
-	   </tmpl_loop>
-	</tmpl_if>
-</table>
-
-~~~
-<style type="text/css">
-   .fontSettings {
-	 font-family:arial;
-	 font-size:9pt;
-   }
-   
-   .projectView td {
-      border:solid silver 1px;
-	  border-bottom:solid gray 1px;
-	  font-size:9pt;
-	  font-family:arial;			
-   }
-   .projectView a {
-	  color:#3391DD;
-   }
-   tr.header td {
-	  font-weight:bold;
-   }
-   td.projectNames {
-	  white-space:nowrap;			
-   }
-   td.projectNames a {
-	  display:block;
-	  color:#3391DD;
-   }
-   td.projectNames a.level1 {
-	  margin:0 10px;			
-   }
-   td.projectNames a.level2 {
-	  margin:0px 10px 0px 20px;
-   }
-   td.projectNames a.level3 {
-	  margin:0px 10px 0px 30px;			
-   }	
-   td.projectNames a.level4 {
-	  margin:0px 10px 0px 40px;			
-   }		
-   td.projectNames a.level5 {
-      margin:0px 10px 0px 50px;			
-   }		
-   tr.alt td {
-	  background-color:#F0F0F0;
-   }
-   div.completeContainer {
-	  position:relative;
-	  z-index:0;
-	  background: #000;
-	  color:white;
-	  text-align:center;
-   }
-   div.completeBar {
-	  position:absolute;
-	  height:100%;
-	  top:0px;
-	  left:0px;
-	  background: #7AB7E9;
-	  z-index:1;
-   }
-   div.completeText {
-	  position:relative;
-	  height:100%;
-	  top:0px;
-	  left:0px;			
-	  z-index:2;			
-   }
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.3/wgtemplate_default_submission.tmpl b/docs/upgrades/templates-6.99.3/wgtemplate_default_submission.tmpl
deleted file mode 100644
index aad73ab26..000000000
--- a/docs/upgrades/templates-6.99.3/wgtemplate_default_submission.tmpl
+++ /dev/null
@@ -1,356 +0,0 @@
-#PBtmpl0000000000000067
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<div class="defaultSubmissionDetails">
-<tmpl_if avatar.url>
-<div style="width: 100%; text-align: center;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>	
-	<b><tmpl_var user.label>:</b> 
-		<tmpl_if user.isVisitor>
-			<tmpl_var username>
-		<tmpl_else>
-			<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-		</tmpl_if>
-		<br />
-	<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-	<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-	<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-		<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-		</tmpl_unless>
-		<br />
-	<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_var status> [ <tmpl_if isArchived> <a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	<tmpl_else>	
-		<tmpl_if user.isPoster>
-			<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-		</tmpl_if>	
-	</tmpl_if>	
-</div>
-
-<div class="collaborationThreadContent">
-<p><b><tmpl_var userDefined2> <tmpl_var userDefined3></b></p>
-	<tmpl_var content>
-</div>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>" class="controlLink"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>" class="controlLink"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>" class="controlLink"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<div style="clear:both;"></div>
-
-<tmpl_if repliesAllowed>
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">	
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-<tmpl_if avatar.url>
-<td style="padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</td>
-</tmpl_if>
-							<td style="padding-right: 25px;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-							</td>
-						</tr>
-						</table>
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>" class="controlLink"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>" class="controlLink"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>" class="controlLink"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-<tmpl_if avatar.url>
-<td style="padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</td>
-</tmpl_if>
-							<td style="padding-right: 25px;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />	
-								<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-							</td>
-						</tr>
-						</table>
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>" class="controlLink"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>" class="controlLink"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>" class="controlLink"><tmpl_var delete.label></a>
-								</tmpl_if><br />
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>" class="controlLink"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>" class="controlLink"><tmpl_var back.label></a>
-	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>" class="controlLink"><tmpl_var next.label></a>				
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>" class="controlLink"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>" class="controlLink"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>" class="controlLink"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>" class="controlLink"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>" class="controlLink"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>" class="controlLink"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>" class="controlLink"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-	<br />
-</div>
-~~~
-<style type="text/css">
-.defaultSubmissionDetails
-{
-	float: right; 		
-	padding: 2px; 
-	margin: 2px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:20px;
-}
-
-.defaultSubmissionDetails a
-{
-	color:#29587E;
-}
-
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	background-color: #eeeeee;
-	padding: 3px;
-}
-.postData td {
-	font-size: 9pt;
-	color: black;
-	font-family:arial;
-}
-.postControls {
-	border-top: 1px solid #cccccc;
-	background-color: #676767;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-	clear:both;
-	width:100%;
-	display:block;
-	-moz-box-sizing:border-box;
-	text-align:right;
-	margin-top:1px;
-}
-.postControls a:link, .postControls a:visited
-{
-	text-decoration:underline;
-	color:white;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.threadData {
-	font-size: 11px;
-	padding: 3px;
-	font-family:arial;
-}
-
-
-.collaborationThreadContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.3/wgtemplate_default_thread.tmpl b/docs/upgrades/templates-6.99.3/wgtemplate_default_thread.tmpl
deleted file mode 100644
index ce5c33adc..000000000
--- a/docs/upgrades/templates-6.99.3/wgtemplate_default_thread.tmpl
+++ /dev/null
@@ -1,256 +0,0 @@
-#PBtmpl0000000000000032
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-	
-<div style="float: left; width: 70%">
-	<h2><a href="<tmpl_var collaboration.url>"><tmpl_var collaboration.title></a></h2>
-</div>
-<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-</div>
-<div style="clear: both;"></div>
-
-<tmpl_if layout.isFlat>
-<!-- begin flat layout -->
-	<tmpl_loop post_loop>
-		<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-			<a name="<tmpl_var assetId>"></a>
-			<div class="postSubject">
-				<tmpl_var title>
-			</div>
-			<div class="postData">
-<tmpl_if avatar.url>
-<div style="float: left; padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>
-				<div style="float: left; padding-right: 25px;">
-					<b><tmpl_var user.label>:</b> 
-						<tmpl_if user.isVisitor>
-							<tmpl_var username>
-						<tmpl_else>
-							<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-						</tmpl_if>
-						<br />
-					<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-				</div>	
-				<div>
-					<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-					<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-						<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-						</tmpl_unless>
-						<br />
-					<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <a href="<tmpl_var approve.url>"><tmpl_var approve.label></a> | <a href="<tmpl_var deny.url>"><tmpl_var deny.label></a> ]<br />
-					<tmpl_else>	
-						<tmpl_if user.isPoster>
-							<b><tmpl_var status.label>:</b> <tmpl_var status> [ <tmpl_if isArchived> <a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-						</tmpl_if>	
-					</tmpl_if>	
-				</div>	
-			</div>
-			<div class="postMessage">
-				<tmpl_var content>
-<tmpl_loop attachment_loop>
-	<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-</tmpl_loop>
-<div style="clear: both;"></div>
-
-			</div>
-			<tmpl_unless isLocked>
-				<div class="postControls">
-					<tmpl_if user.canReply>
-						<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull; 
-					</tmpl_if>
-					<tmpl_if user.canEdit>
-						<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
-						<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-					</tmpl_if>
-				</div>
-			</tmpl_unless>
-		</div>
-	</tmpl_loop>
-<!-- end flat layout -->
-</tmpl_if>
-
-<tmpl_if layout.isNested>
-<!-- begin nested layout -->
-	<tmpl_loop post_loop>
-		<div style="margin-left: <tmpl_var depthX10>px;">
-			<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-				<a name="<tmpl_var assetId>"></a>
-				<div class="postSubject">
-					<tmpl_var title>
-				</div>
-				<div class="postData">
-<tmpl_if avatar.url>
-<div style="float: left; padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>
-					<div style="float: left; padding-right: 25px;">
-						<b><tmpl_var user.label>:</b> 
-							<tmpl_if user.isVisitor>
-								<tmpl_var username>
-							<tmpl_else>
-								<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-							</tmpl_if>
-							<br />
-						<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-					</div>	
-					<div>
-						<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-						<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-							<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-							</tmpl_unless>
-							<br />
-							<tmpl_if user.isPoster>
-								<b><tmpl_var status.label>:</b> <tmpl_var status> [ <tmpl_if isArchived> <a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-							</tmpl_if>	
-					</div>	
-				</div>
-				<div class="postMessage">
-					<tmpl_var content>
-<tmpl_loop attachment_loop>
-	<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-</tmpl_loop>
-<div style="clear: both;"></div>
-
-				</div>
-				<tmpl_unless isLocked>
-					<div class="postControls">
-						<tmpl_if user.canReply>
-							<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull;
-						</tmpl_if>
-						<tmpl_if user.canEdit>
-							<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
-							<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-						</tmpl_if>
-					</div>
-				</tmpl_unless>
-			</div>
-		</div>
-	</tmpl_loop>
-<!-- end nested layout -->
-</tmpl_if>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination" style="margin-top: 20px;">
-		[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-	</div>
-</tmpl_if>
-
-<div style="margin-top: 20px;" class="bottomControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> &bull;
-	</tmpl_if>	
-	<tmpl_if next.url>
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> &bull; 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a> &bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a> &bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a> &bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a> &bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-	.postBorder {
-		border: 1px solid #cccccc;
-		margin-bottom: 10px;
-	}
- 	.postBorderCurrent {
-		border: 3px dotted black;
-		margin-bottom: 10px;
-	}
-	.postSubject {
-		border-bottom: 1px solid #cccccc;
-		font-weight: bold;
-		padding: 3px;
-	}
-	.postData {
-		border-bottom: 1px solid #cccccc;
-		font-size: 9pt;
-		background-color: #eeeeee;
-		color: black;
-		padding: 3px;
-	}
-	.postData a {
-		color:#29587E;
-		text-decoration:underline;
-	}
-	.postData a:hover {
-		text-decoration:none;
-	}
-	.postControls {
-		border-top: 1px solid #cccccc;
-		background-color: #676767;
-		color: black;
-		padding: 3px;
-		text-align:right;
-	}
-	.postControls a:link, .postControls a:visited {
-		color:white;
-		text-decoration:underline;
-	}
-	.postControls a:hover {
-		text-decoration:none;
-	}
-	.bottomControls {
-		background-color:#676767;
-		padding: 3px;
-		text-align:right;
-	}
-	.bottomControls a:link, .bottomControls a:visited {
-		color:white;
-		text-decoration:underline;
-	}	
-	.bottomControls a:hover {
-		text-decoration:none;
-	}
-	.postMessage {
-		padding: 3px;
-	}
-	.currentThread {
-		background-color: #eeeeee;
-	}
-	.threadHead {
-		font-weight: bold;
-		border-bottom: 1px solid #cccccc;
-		font-size: 9pt;
-		background-color: #eeeeee;
-		color: black;
-		padding: 3px;
-	}
-	.threadData {
-		font-size: 11px;
-		padding: 3px;
-	}
-</style>
diff --git a/docs/upgrades/templates-6.99.3/wgtemplate_default_tt_row.tmpl b/docs/upgrades/templates-6.99.3/wgtemplate_default_tt_row.tmpl
deleted file mode 100644
index 39bc5fef1..000000000
--- a/docs/upgrades/templates-6.99.3/wgtemplate_default_tt_row.tmpl
+++ /dev/null
@@ -1,68 +0,0 @@
-#TimeTrackingTMPL000003
-<table class="timeTracking02" cellpadding="3" cellspacing="0">
-<tbody id="ttbody">
-   <tr class="tt_title" id="tt_title">
-      <td colspan="4" align="left"><tmpl_var time.report.header></td>
-	  <td colspan="2" align="right"><tmpl_var time.report.hours.label> <strong style="color:red;" id="totalHours"><tmpl_var time.totalHours></strong></td>
-   </tr>
-   <tr class="tt_header" id="tt_header">
-      <td width="10%"><tmpl_var time.report.date.label></td>
-	  <td width="20%"><tmpl_var time.report.project.label></td>
-	  <td width="20%"><tmpl_var time.report.task.label></td>
-	  <td width="10%"><tmpl_var time.report.hours.label></td>
-	  <td width="40%"><tmpl_var time.report.comments.label></td>
-	  <td>&#160;</td>
-   </tr>
-   <tmpl_loop time.entry.loop>
-      <tr id="<tmpl_var row.id>">
-         <td class="cell"><tmpl_var form.taskEntryId><tmpl_var form.date></td>
-         <td class="cell"><tmpl_var form.project></td>
-         <td class="cell"><tmpl_var form.task></td>
-         <td class="cell"><tmpl_var form.hours></td>
-         <td class="cell"><tmpl_var form.comments></td>
-         <td><img src="<tmpl_var extras>/delete.gif" border="0" onclick="removeRow('<tmpl_var row.id>')" style="cursor:pointer"/></td>
-      </tr>
-   </tmpl_loop>
-   <tr class="tt_empty" id="tt_empty">
-      <td colspan="6" style="border-top:solid gray 2px;">
-	     <table width="100%" cellpadding="2" cellspacing="0">
-			<tr>
-				<td align="left"><a href="<tmpl_var report.lastWeek.url>" class="PM_blueLink"><b>&lsaquo;</b> Last Week</a></td>
-				<td align="right"><a href="<tmpl_var report.nextWeek.url>" class="PM_blueLink">Next Week <b>&rsaquo;</b></a></td>
-			</tr>
-			<tr>
-				<td colspan="2" style="border-bottom:solid #F0F0F0 1px;">&nbsp;</td>
-			</tr>
-			<tr>
-				<td style="width:60%;" align="left">
-					<tmpl_var time.report.complete.label><tmpl_var form.isComplete>
-				</td>
-				<td style="width:40%" align="right">
-					<input type="button" value="<tmpl_var time.add.row.label>" onclick="addRow();" /> &#160; <input type="submit" value="<tmpl_var time.save.label>" />
-				</td>			
-			</tr>
-	      </table>		
-	   </td>
-	</tr>
- </tbody>
-</table>
-
-<tmpl_unless report.isComplete>
-<table style="display:none" id="tt_table">
-   <tbody>
-      <tr id="<tmpl_var row.id>">
-         <td class="cell"><tmpl_var form.taskEntryId><tmpl_var form.date></td>
-         <td class="cell"><tmpl_var form.project></td>
-         <td class="cell"><tmpl_var form.task></td>
-         <td class="cell"><tmpl_var form.hours></td>
-         <td class="cell"><tmpl_var form.comments></td>
-         <td><img src="<tmpl_var extras>/delete.gif" border="0" onclick="removeRow()" style="cursor:pointer" /></td>
-      </tr>
-   </tbody>
-</table>
-</tmpl_unless>
-
-
-
-~~~
-	
diff --git a/docs/upgrades/templates-6.99.3/wgtemplate_default_tt_view.tmpl b/docs/upgrades/templates-6.99.3/wgtemplate_default_tt_view.tmpl
deleted file mode 100644
index b841a854a..000000000
--- a/docs/upgrades/templates-6.99.3/wgtemplate_default_tt_view.tmpl
+++ /dev/null
@@ -1,310 +0,0 @@
-#TimeTrackingTMPL000001
-<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>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<script language="JavaScript">
-   var nextRowNum = <tmpl_var time.report.rows.total>;
-   var projectTasks = <tmpl_var project.task.array>  //Do not put a semi colon at the end of this.  The app does it
-   
-   //-----------------------------------------------------------------------------------
-   function changeOptions(proj,task) {
-      var projId = proj.value;
-	  //Remove all options from task list except first one
-	  var optLen = task.options.length;
-	  while (task.options.length > 1) {
-		 var elem = task.options[1];
-		 task.removeChild(elem);
-	  }
-	  
-	  if(projId != "") {
-	     //Add new options
-	     var array = projectTasks[projId];
-         for (var word in array) {
-            var opt = document.createElement("option");
-	        opt.setAttribute("value",word);
-	        opt.appendChild(document.createTextNode(array[word]));
-            task.appendChild(opt);
-         }
-      }
-	  
-	  //Fix IE Bug which causes dymamic repopulation to fail
-	  var newtask = task;
-	  var col = task.parentNode;
-	  col.removeChild(task);
-	  col.appendChild(newtask);
-	  
-   }
-   
-   //-----------------------------------------------------------------------------------
-   function recalcHours() {
-	   var newHours = 0;
-	   var rows = document.getElementById("ttbody");
-	   var rowLen = rows.childNodes.length;
-	   
-	   for(var i = 0; i <= rowLen; i++) {
-	      var row = rows.childNodes[i];
-		  if(row && row.id && row.id.indexOf("row") > -1) {
-		     var rowId = row.id;
-		     var idPart = rowId.split("_");
-		     var rowNum = idPart[1];
-		     var hourElem = document.getElementById("hours_"+rowNum+"_formId");
-		     if (hourElem) {
-		        newHours += parseFloat(hourElem.value);
-	         }
-	      }
-	   }
-	   document.getElementById('totalHours').innerHTML = newHours;
-   }
-
-   //-----------------------------------------------------------------------------------   
-   function getTarget(e) {
-      var targ;
-      if (!e) e = window.event || window.Event;
-      if (e.target) targ = e.target;
-      else if (e.srcElement) targ = e.srcElement;
-      if (targ.nodeType == 3) // defeat Safari bug
-         targ = targ.parentNode;
-      return targ
-   }  
-
-   //-----------------------------------------------------------------------------------    
-   function removeRow(e) {
-      if(!e) e = window.event || window.Event;
-	  var eleId = e;
-      if(typeof(e) == "object") {
-	    var targ = getTarget(e);
-		eleId = targ.parentNode.parentNode.id;
-	  } 
-	  var row = document.getElementById(eleId);
-	  var ttbody = document.getElementById("ttbody");
-      var timeRowCount = getTimeRowCount();
-	  if(timeRowCount > 1) {
-	     ttbody.removeChild(row);
-	     recalcHours();
-		 return;
-	  }
-	  alert("<tmpl_var js.alert.removeRow.error>");
-   }
-   
-   //-----------------------------------------------------------------------------------   
-   function getTimeRowCount() {
-      var rows = document.getElementById("ttbody");
-      var rowLen = rows.childNodes.length;
-	  var count = 0;
-	  
-	  for(var i = 0; i <= rowLen; i++) {
-	     var row = rows.childNodes[i];
-		 //Skip Text and Attribute Nodes
-		 if(row && row.id && row.id.indexOf("row") > -1) count++;
-	  }
-	  return count;
-   }
-   
-   //-----------------------------------------------------------------------------------  
-   function countRows(ttbody) {  
-      var tbLen = ttbody.childNodes.length;
-	  var rowCount = 0;
-	  for (var i = (tbLen - 1); i >= 0; i--) {
-	     if(ttbody.childNodes[i].nodeType != 1) continue;
-		 rowCount++;
-	  }
-	  return rowCount;
-   }
-      
-   //-----------------------------------------------------------------------------------  
-   function addRow() {
-      var rowx = document.getElementById('row_x');
-	  
-	  var ttbody = document.getElementById('ttbody');
-	  //Insert row into the right place
-	  var rowCount = countRows(ttbody); 	  //Count actual rows for firefox b/c it's stupid
-	  var row = ttbody.insertRow((rowCount-2));
-	  
-	  row.id='row_'+nextRowNum;
-	  //Task Entry Id
-	  var rowLen = rowx.childNodes.length;
-	  
-	  for ( var i = 0; i < rowLen; i++) {
-	     if(rowx.childNodes[i].nodeType != 1) continue;
-	     // create the cell
-         var clonetd = rowx.childNodes[i].cloneNode(true);
-		 
-		 var td = row.appendChild(clonetd);
-	     var colLen = td.childNodes.length;
-		 for ( var j = 0; j < colLen; j++) {
-		    var node = td.childNodes[j];
-//			alert(node + " " + node.nodeType);
-			//Skip Text and Attirbute Node Types
-			if(node.nodeType != 1) continue;
-			//alert(node + " " + node.tagName);
-			var nodeName = node.name;
-				
-			//Handle Image Node
-			if(node.tagName == "IMG") {
-			   var newImg = document.createElement('img');
-			   newImg.setAttribute("style","cursor:pointer");
-			   newImg.src = "<tmpl_var extras>/delete.gif";
-			   newImg.onclick = removeRow;
-			   
-			   childLen = node.childNodes.length;
-			  // alert("removing this node");
-			   td.removeChild(node);
-			   
-			  // alert("appending new node: " + newImg);
-			   td.appendChild(newImg);
-			   continue;
-			}
-			
-			//Skip Nodes that have no names
-			if(nodeName == "") continue;
-			var nameParts = nodeName.split("_");
-			var colName = nameParts[0];
-			//Set New Node Name
-			node.name = colName + "_" + nextRowNum;
-			//Set New Node ID
-			node.id = colName + "_" + nextRowNum + "_formId";
-			
-			if(colName == "projectId") {
-			   node.onchange = new Function('changeOptions(this,document.getElementById("taskId_'+nextRowNum+'_formId"));'); 
-			} 
-		 }   
-	  
-	  }
-	  nextRowNum++;
-   }
-   
-   //-----------------------------------------------------------------------------------   
-   function validateForm(form) {
-      //Set Row Total
-      form.rowTotal.value = (nextRowNum - 1);
-	  if(parseFloat(document.getElementById('totalHours').innerHTML) > 168) {
-	     alert("<tmpl_var js.alert.validate.hours.error>");
-		 return false;
-	  }
-	  
-	  var rows = document.getElementById("ttbody");
-      var rowLen = rows.childNodes.length;
-	  var isValid = true;
-	  	  
-	  for(var i = 0; i <= rowLen; i++) {
-	     var row = rows.childNodes[i];
-		 if(row && row.id && row.id.indexOf("row") > -1) {
-		    var rowId = row.id;
-		    var idPart = rowId.split("_");
-		    var rowNum = idPart[1];
-		    var taskDateElem = document.getElementById("taskDate_"+rowNum+"_formId");
-			taskDateElem.style.background='#FFFFFF';
-			var projectElem = document.getElementById("projectId_"+rowNum+"_formId");
-			projectElem.style.background='#FFFFFF';
-			var taskElem = document.getElementById("taskId_"+rowNum+"_formId");
-			taskElem.style.background='#FFFFFF';
-			var hourElem = document.getElementById("hours_"+rowNum+"_formId");
-			hourElem.style.background='#FFFFFF';
-			//Uncomment below if you wish comments to be required
-			//var comments = document.getElementById("hours_"+rowNum+"_formId");
-			//comments.style.background='#FFFFFF';
-			
-			//Uncomment below if you wish comments to be required
-			//if(taskDateElem.value != "" || projectElem.value != "" || taskElem.value != "" || hourElem.value != "" || comments.value != "" ) {
-			//Comment below if you wish comments to be required
-			if(taskDateElem.value != "" || projectElem.value != "" || taskElem.value != "" || (hourElem.value != "" && hourElem.value != "0")) {
-			   if(taskDateElem.value == "") {
-				  taskDateElem.style.background='#FFFF99';
-			      isValid = false;
-			   } 
-			   
-			   if(projectElem.value == "") {
-			      projectElem.style.background='#FFFF99';
-			      isValid = false;
-			   } 
-			   
-			   if(taskElem.value == "") {
-			      taskElem.style.background='#FFFF99';
-				  isValid = false;
-			   } 
-			   
-			   if(hourElem.value == "" || hourElem.value == 0) {
-			      hourElem.style.background='#FFFF99';
-				  isValid = false;
-			   }
-			   
-			   //Uncomment below if you wish comments to be required
-			   /*if(comments.value == "") {
-			      commnts.style.background='#FFFF99';
-				  isValid = false;
-			   }*/
-			}
-		 }
-	  }
-	  
-	  if(!isValid) {
-	     alert("<tmpl_var js.alert.validate.incomplete.error>");
-		 return false;
-	  }
-	  
-	  return true;
-   }
-   
-</script>
-
-<p><tmpl_if project.manage.url><a href="<tmpl_var project.manage.url>"><tmpl_var project.manage.label></a></tmpl_if></p>
-<tmpl_var form.header>
-<tmpl_var form.timetracker>
-<tmpl_var form.footer>
-
-~~~
-	<style type="text/css">
-		.timeTracking02 {			
-			width:850px;
-		}
-		.timeTracking02 td {
-			border:solid silver 1px;
-			border-bottom:solid gray 1px;
-			font-size:9pt;
-			font-family:arial;			
-		}
-		tr.tt_title td {
-			font-weight:bold;			
-			background-color:#F0F0F0;
-			border-style:none;
-			font-size:11pt;
-		}
-		tr.tt_header td {
-			font-weight:bold;
-			text-align:center;		
-		}
-		tr.tt_empty td {
-			border-style:none;
-		}
-		
-		a.PM_blueLink {
-			color:#29587E;
-			text-decoration:none;
-			font-weight:bold;
-		}
-		a.PM_blueLink:hover {
-			text-decoration:underline;
-		}	
-		
-		.pt-select {
-	       font-weight: normal;
-	       color: black;
-  	       width: 175px;
-        }
-		.date-select {
-		   font-weight: normal;
-	       color: black;
-  	       width: 100px;
-		}
-	</style>
diff --git a/docs/upgrades/templates-6.99.3/wgtemplate_job.tmpl b/docs/upgrades/templates-6.99.3/wgtemplate_job.tmpl
deleted file mode 100644
index 9ef348bc8..000000000
--- a/docs/upgrades/templates-6.99.3/wgtemplate_job.tmpl
+++ /dev/null
@@ -1,327 +0,0 @@
-#PBtmpl0000000000000098
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<tmpl_if user.isModerator>
-	<div style="float: right; font-size: 11px; border: 1px solid #cccccc; padding: 2px; margin: 2px;">
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	</div>
-</tmpl_if>	
-
-<tmpl_if content>
-	<b>Job Description</b><br />
-	<p><tmpl_var content></p>
-</tmpl_if>
-
-<tmpl_if userDefined3>
-	<b>Job Requirements</b><br />
-	<p><tmpl_var userDefined3></p>
-</tmpl_if>
-
-<table width="100%">
-<tr>
-	<td class="tableHeader">Date Posted</td>
-	<td class="tableData"><tmpl_var dateSubmitted.human>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Location</td>
-	<td class="tableData"><tmpl_var userDefined2>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Compensation</td>
-	<td class="tableData"><tmpl_var userDefined1>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Views</td>
-	<td class="tableData"><tmpl_var views>&#160;</td>
-</tr>
-</table>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<tmpl_if repliesAllowed>
-
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<div style="float: left; width: 50%">
-							<b><tmpl_var user.label>:</b> 
-								<tmpl_if user.isVisitor>
-									<tmpl_var username>
-								<tmpl_else>
-									<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-								</tmpl_if>
-								<br />
-							<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-						</div>	
-						<div>
-							<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-							<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<tmpl_if user.isPoster>
-									<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-								</tmpl_if>	
-						</div>	
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-							<div style="float: left; width: 50%">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-							</div>	
-							<div>
-								<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-									<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-									</tmpl_unless>
-									<br />
-									<tmpl_if user.isPoster>
-										<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-									</tmpl_if>	
-							</div>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>			
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-	font-size:9pt;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.postControls
-{
-	background:#676767;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-.postControls a:link, .postControls a:visited
-{
-	color:white;
-	text-decoration:underline;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.threadData {
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-
-.tableHeader
-{
-	width:20%;
-	background-color:#DADADA;
-	font-family:arial;
-	font-size:9pt;	
-}
-
-.tableData
-{
-	width:80%;
-	border:solid #DADADA 1px;
-	font-family:arial;
-	font-size:9pt;	
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.3/wgtemplate_link.tmpl b/docs/upgrades/templates-6.99.3/wgtemplate_link.tmpl
deleted file mode 100644
index 1a74c1b82..000000000
--- a/docs/upgrades/templates-6.99.3/wgtemplate_link.tmpl
+++ /dev/null
@@ -1,303 +0,0 @@
-#PBtmpl0000000000000113
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<tmpl_if user.isModerator>
-	<div style="float: right; font-size: 11px; border: 1px solid #cccccc; padding: 2px; margin: 2px;">
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	</div>
-</tmpl_if>	
-
-<tmpl_if content>
-	<div class="linkContent">
-	<b>Link Description</b><br /><br />
-	<tmpl_var content><br />
-	
-	<b>Link URL</b><br /><br />
-	<a href="<tmpl_var userDefined1>"><tmpl_var userDefined1></a><br /><br />
-	</div>
-</tmpl_if>
-
-
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<tmpl_if repliesAllowed>
-
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<div style="float: left; width: 50%">
-							<b><tmpl_var user.label>:</b> 
-								<tmpl_if user.isVisitor>
-									<tmpl_var username>
-								<tmpl_else>
-									<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-								</tmpl_if>
-								<br />
-							<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-						</div>	
-						<div>
-							<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-							<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<tmpl_if user.isPoster>
-									<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-								</tmpl_if>	
-						</div>	
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull; 
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-							<div style="float: left; width: 50%">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-							</div>	
-							<div>
-								<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-									<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-									</tmpl_unless>
-									<br />
-									<tmpl_if user.isPoster>
-										<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-									</tmpl_if>	
-							</div>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>">List All Links</a>
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		&bull;
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.postControls
-{
-	background:#676767;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-.postControls a:link, .postControls a:visited
-{
-	color:white;
-	text-decoration:underline;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.threadData {
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-.linkContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-.linkContent a
-{
-	color:#29587E;
-}
-h2
-{
-	font-family:arial;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.3/wgtemplate_request_tracker_post_template.tmpl b/docs/upgrades/templates-6.99.3/wgtemplate_request_tracker_post_template.tmpl
deleted file mode 100644
index f1daa1cd1..000000000
--- a/docs/upgrades/templates-6.99.3/wgtemplate_request_tracker_post_template.tmpl
+++ /dev/null
@@ -1,364 +0,0 @@
-#PBtmpl0000000000000209
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<div class="defaultSubmissionDetails">
-<tmpl_if avatar.url>
-<div style="width: 100%; text-align: center;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>	
-	<b><tmpl_var user.label>:</b> 
-		<tmpl_if user.isVisitor>
-			<tmpl_var username>
-		<tmpl_else>
-			<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-		</tmpl_if>
-		<br />
-	<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-	<b><tmpl_var severity.label>:</b> <tmpl_var userDefined1><br />
-	<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-	<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-		<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-		</tmpl_unless>
-		<br />
-	<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> &nbsp; &nbsp; [ <a href="<tmpl_var unarchive.url>"><tmpl_var open.label></a> <tmpl_else> <tmpl_var open.label> &nbsp; &nbsp; [ <a href="<tmpl_var archive.url>"><tmpl_var close.label></a></tmpl_if> ]<br />
-	<tmpl_else>	
-		<tmpl_if user.isPoster>
-			<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> <tmpl_else> <tmpl_var open.label></tmpl_if><br />
-		</tmpl_if>	
-	</tmpl_if>	
-<tmpl_if karmaIsEnabled>
-	<b><tmpl_var karmaRank.label>:</b> <tmpl_var karmaRank><br />
-<b><tmpl_var transferkarma.label>:</b>
-<tmpl_var transfer.karma.form>
-</tmpl_if>	
-</div>
-
-<div class="collaborationThreadContent">
-	<tmpl_var content>
-</div>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<div style="clear:both;"></div>
-
-<tmpl_if repliesAllowed>
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-<tmpl_if avatar.url>
-<td style="padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</td>
-</tmpl_if>
-							<td style="padding-right: 25px;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>	
-								<br />									
-							</td>
-						</tr>
-						</table>
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-<tmpl_if avatar.url>
-<td style="padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</td>
-</tmpl_if>
-							<td style="padding-right: 25px;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>	
-								<br />
-							</td>
-						</tr>
-						</table>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>
-	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a>				
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-.defaultSubmissionDetails
-{
-	float: right; 		
-	padding: 2px; 
-	margin: 2px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:20px;
-}
-
-.defaultSubmissionDetails a
-{
-	color:#29587E;
-}
-
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	background-color: #eeeeee;
-	padding: 3px;
-}
-.postData td {
-	font-size: 9pt;
-	color: black;
-	font-family:arial;
-}
-.postControls {
-	border-top: 1px solid #cccccc;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-	clear:both;
-	width:100%;
-display:block;
-	-moz-box-sizing:border-box;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.threadData {
-	font-size: 11px;
-	padding: 3px;
-	font-family:arial;
-}
-
-.postControls
-{
-	background:#676767;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-.postControls a:link, .postControls a:visited
-{
-	color:white;
-	text-decoration:underline;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.collaborationThreadContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.4/commerce_checkout_confirmation.tmpl b/docs/upgrades/templates-6.99.4/commerce_checkout_confirmation.tmpl
deleted file mode 100644
index 6b339c7e4..000000000
--- a/docs/upgrades/templates-6.99.4/commerce_checkout_confirmation.tmpl
+++ /dev/null
@@ -1,66 +0,0 @@
-#PBtmpl0000000000000016
-
-<a href="<tmpl_var viewShoppingCart.url>"><tmpl_var viewShoppingCart.label></a> &middot;
-<a href="<tmpl_var changePayment.url>"><tmpl_var changePayment.label></a> &middot; 
-<a href="<tmpl_var changeShipping.url>"><tmpl_var changeShipping.label></a><br>
-<br>
-
-<tmpl_var title><br>
-<ul>
-<tmpl_loop errorLoop>
-<li><tmpl_var message></li>
-</tmpl_loop>
-</ul>
-
-<table> <tr align="left">
-      <th style="border-bottom: 2px solid black">Product</th>
-      <th style="border-bottom: 2px solid black">Quantity</th>
-      <th style="border-bottom: 2px solid black" align='center'>Price</th>
-      <th style="border-bottom: 2px solid black">Amount</th>
-      <th style="border-bottom: 2px solid black">Each</th>
-  </tr>
-
-  <tmpl_if normalItems>
-  </tmpl_if>
-
-  <tmpl_loop normalItemsLoop>
-  <tr>
-      <td align="left"><tmpl_var name></td>
-      <td align="center"><tmpl_var quantity></td>
-      <td align="right"><tmpl_var price></td>
-      <td align="right"><tmpl_var totalPrice></td>
-      <td>&nbsp;</td>
-  </tr>
-  </tmpl_loop>
-
-  <tmpl_loop recurringItemsLoop>
-  <tr>
-      <td align="left"><tmpl_var name></td>
-      <td align="center"><tmpl_var quantity></td>
-      <td align="left"><tmpl_var price></td>
-      <td align="right"><tmpl_var totalPrice></td>
-      <td align="left"><tmpl_var period></td>
-  </tr>
-</tmpl_loop>
-  <tr style="border-top: 1px solid black">
-      <td colspan='2' style="border-top: 1px solid black">&nbsp;</td>
-      <td align="right" style="border-top: 1px solid black"><b>Subtotal</b></td>
-      <td align="right" style="border-top: 1px solid black"><b><tmpl_var subtotal></b></td>
-  </tr>
-  <tr>
-      <td colspan="3" align="right">Shipping</td>
-      <td align="right"><tmpl_var shippingCost></td>
-  </tr>
-  <tr>
-      <td colspan="3" align="right"><tmpl_var discountsApplied.label></td>
-      <td align="right"><tmpl_var discountsApplied></td>
-  </tr>
-  <tr>
-      <td colspan="3" align="right" style="border-top: 1px solid black"><b>Total</b></td>
-      <td align="right" style="border-top: 1px solid black"><b><tmpl_var total></b></td>
-
-</table>
-
-<br><br>
-
-<tmpl_var form>
diff --git a/docs/upgrades/templates-6.99.4/data_list.tmpl b/docs/upgrades/templates-6.99.4/data_list.tmpl
deleted file mode 100644
index 50f32d8a4..000000000
--- a/docs/upgrades/templates-6.99.4/data_list.tmpl
+++ /dev/null
@@ -1,79 +0,0 @@
-#PBtmpl0000000000000021
-<a href="<tmpl_var back.url>"><tmpl_var back.label></a>
-<tmpl_if session.var.adminOn>
-<p><tmpl_var controls></p>
-</tmpl_if><p />
-
-<tmpl_if canEdit>
-	<div class="dataControls">
-		&bull; <a href="<tmpl_var export.tab.url>"><tmpl_var export.tab.label></a>
-		<tmpl_if hasEntries>
-			&bull; <a href="<tmpl_var deleteAllEntries.url>" onclick="<tmpl_var javascript.confirmation.deleteAll>"><tmpl_var deleteAllEntries.label></a>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-			&bull; <a href="<tmpl_var addField.url>"><tmpl_var addField.label></a>
-			&bull; <a href="<tmpl_var addTab.url>"><tmpl_var addTab.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_if>
-
-<table width="100%">
-<tr>
-<td class="tableHeader">Entry ID</td>
-<tmpl_loop field_loop>
-  <tmpl_unless field.isMailField>
-    <td class="tableHeader"><tmpl_var field.label></td>
-  </tmpl_unless field.isMailField>
-</tmpl_loop field_loop>
-<td class="tableHeader">Submission Date</td>
-</tr>
-<tmpl_loop record_loop>
-<tr>
-  <td class="tableData"><a href="<tmpl_var record.edit.url>"><tmpl_var record.entryId></a></td>
-  <tmpl_loop record.data_loop>
-    <tmpl_unless record.data.isMailField>
-       <td class="tableData"><tmpl_var record.data.value></td>
-     </tmpl_unless record.data.isMailField>
-  </tmpl_loop record.data_loop>
-  <td class="tableData"><tmpl_var record.submissionDate.human></td>
-</tr>
-</tmpl_loop record_loop>
-</table>
-
-~~~
-<style type="text/css">
-h2{
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.errors{
-	font-family:arial;
-	font-size:9pt;
-}
-.defaultData td{
-	font-family:arial;
-	font-size:9pt;
-}
-.dataControls
-{
-	-moz-box-sizing:border-box;
-	background:#676767;
-	color:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-.dataControls a
-{
-	color:white;
-	font-size:8pt;
-	text-decoration:underline;
-}
-.dataControls a:hover {
-	text-decoration:none;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.4/default_dataform.tmpl b/docs/upgrades/templates-6.99.4/default_dataform.tmpl
deleted file mode 100644
index f94fb2cd9..000000000
--- a/docs/upgrades/templates-6.99.4/default_dataform.tmpl
+++ /dev/null
@@ -1,110 +0,0 @@
-#PBtmpl0000000000000141
-<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 error_loop>
-	<ul class="errors">
-		<tmpl_loop error_loop>
-			<li><b><tmpl_var error.message></b></li>
-		</tmpl_loop>
-	</ul>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-	<p />
-</tmpl_if>
-
-<tmpl_if canEdit>
-	<div class="dataControls">
-		<a href="<tmpl_var entryList.url>"><tmpl_var entryList.label></a>
-		&bull; <a href="<tmpl_var export.tab.url>"><tmpl_var export.tab.label></a>
-		<tmpl_if entryId>
-			&bull; <a href="<tmpl_var delete.url>" onclick="<tmpl_var javascript.confirmation.deleteOne>"><tmpl_var delete.label></a>
-		</tmpl_if>
-		<tmpl_if hasEntries>
-			&bull; <a href="<tmpl_var deleteAllEntries.url>" onclick="<tmpl_var javascript.confirmation.deleteAll>"><tmpl_var deleteAllEntries.label></a>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-			&bull; <a href="<tmpl_var addField.url>"><tmpl_var addField.label></a>
-			&bull; <a href="<tmpl_var addTab.url>"><tmpl_var addTab.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_if>
-<tmpl_var form.start>
-<table class="defaultData">
-        <tmpl_loop field_loop>
-                <tmpl_unless field.isHidden>
-                        <tr>
-                                <td class="formDescription" valign="top">
-                                        <tmpl_if session.var.adminOn>
-                                                <tmpl_if canEdit>
-                                                        <tmpl_var field.controls>
-                                                </tmpl_if>
-                                        </tmpl_if>
-                                        <tmpl_var field.label>
-                                </td>
-                                <td class="tableData" valign="top">
-                                        <tmpl_if field.isDisplayed>
-                                                <tmpl_var field.value>
-                                        <tmpl_else>
-                                                <tmpl_var field.form>
-                                        </tmpl_if>
-                                        <tmpl_if field.isRequired>*</tmpl_if>
-                                        <span class="formSubtext">
-                                                <br />
-                                                <tmpl_var field.subtext>
-                                        </span>
-                                </td>
-                        </tr>
-                </tmpl_unless>
-        </tmpl_loop>
-</table>
-<br />
-<tmpl_var form.save>
-<tmpl_var form.end>
-
-~~~
-<style type="text/css">
-h2{
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.errors{
-	font-family:arial;
-	font-size:9pt;
-}
-.defaultData td{
-	font-family:arial;
-	font-size:9pt;
-}
-.dataControls
-{
-	-moz-box-sizing:border-box;
-	background:#676767;
-	color:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-.dataControls a
-{
-	color:white;
-	font-size:8pt;
-	text-decoration:underline;
-}
-.dataControls a:hover {
-	text-decoration:none;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.4/default_submission.tmpl b/docs/upgrades/templates-6.99.4/default_submission.tmpl
deleted file mode 100644
index 6b5b26c95..000000000
--- a/docs/upgrades/templates-6.99.4/default_submission.tmpl
+++ /dev/null
@@ -1,378 +0,0 @@
-#PBtmpl0000000000000067
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<div class="defaultSubmissionDetails">
-<tmpl_if avatar.url>
-<div style="width: 100%; text-align: center;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>	
-	<b><tmpl_var user.label>:</b> 
-		<tmpl_if user.isVisitor>
-			<tmpl_var username>
-		<tmpl_else>
-			<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-		</tmpl_if>
-		<br />
-	<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-	<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-	<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-		<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-		</tmpl_unless>
-		<br />
-	<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_var status> [ <tmpl_if isArchived> <a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	<tmpl_else>	
-		<tmpl_if user.isPoster>
-			<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-		</tmpl_if>	
-	</tmpl_if>	
-</div>
-
-<div class="collaborationThreadContent">
-<p><b><tmpl_var userDefined2> <tmpl_var userDefined3></b></p>
-	<tmpl_var content>
-</div>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>">
-					<tmpl_if isImage>
-						<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-					<tmpl_else>
-						<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-					</tmpl_if>
-				</a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>" class="controlLink"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>" class="controlLink"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>" class="controlLink"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<div style="clear:both;"></div>
-
-<tmpl_if repliesAllowed>
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">	
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-<tmpl_if avatar.url>
-<td style="padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</td>
-</tmpl_if>
-							<td style="padding-right: 25px;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-							</td>
-						</tr>
-						</table>
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;">
-								<a href="<tmpl_var url>">
-									<tmpl_if isImage>
-										<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-									<tmpl_else>
-										<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-									</tmpl_if>
-								</a>
-							</div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>" class="controlLink"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>" class="controlLink"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>" class="controlLink"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-<tmpl_if avatar.url>
-<td style="padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</td>
-</tmpl_if>
-							<td style="padding-right: 25px;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />	
-								<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-							</td>
-						</tr>
-						</table>
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;">
-									<a href="<tmpl_var url>">
-										<tmpl_if isImage>
-											<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-										<tmpl_else>
-											<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-										</tmpl_if>
-									</a>
-								</div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>" class="controlLink"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>" class="controlLink"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>" class="controlLink"><tmpl_var delete.label></a>
-								</tmpl_if><br />
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>" class="controlLink"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>" class="controlLink"><tmpl_var back.label></a>
-	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>" class="controlLink"><tmpl_var next.label></a>				
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>" class="controlLink"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>" class="controlLink"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>" class="controlLink"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>" class="controlLink"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>" class="controlLink"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>" class="controlLink"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>" class="controlLink"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-	<br />
-</div>
-~~~
-<style type="text/css">
-.defaultSubmissionDetails
-{
-	float: right; 		
-	padding: 2px; 
-	margin: 2px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:20px;
-}
-
-.defaultSubmissionDetails a
-{
-	color:#29587E;
-}
-
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	background-color: #eeeeee;
-	padding: 3px;
-}
-.postData td {
-	font-size: 9pt;
-	color: black;
-	font-family:arial;
-}
-.postControls {
-	border-top: 1px solid #cccccc;
-	background-color: #676767;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-	clear:both;
-	width:100%;
-	display:block;
-	-moz-box-sizing:border-box;
-	text-align:right;
-	margin-top:1px;
-}
-.postControls a:link, .postControls a:visited
-{
-	text-decoration:underline;
-	color:white;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.threadData {
-	font-size: 11px;
-	padding: 3px;
-	font-family:arial;
-}
-
-
-.collaborationThreadContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-</style>
diff --git a/docs/upgrades/templates-6.99.4/default_thread.tmpl b/docs/upgrades/templates-6.99.4/default_thread.tmpl
deleted file mode 100644
index 37290ace6..000000000
--- a/docs/upgrades/templates-6.99.4/default_thread.tmpl
+++ /dev/null
@@ -1,272 +0,0 @@
-#PBtmpl0000000000000032
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-	
-<div style="float: left; width: 70%">
-	<h2><a href="<tmpl_var collaboration.url>"><tmpl_var collaboration.title></a></h2>
-</div>
-<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-</div>
-<div style="clear: both;"></div>
-
-<tmpl_if layout.isFlat>
-<!-- begin flat layout -->
-	<tmpl_loop post_loop>
-		<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-			<a name="<tmpl_var assetId>"></a>
-			<div class="postSubject">
-				<tmpl_var title>
-			</div>
-			<div class="postData">
-<tmpl_if avatar.url>
-<div style="float: left; padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>
-				<div style="float: left; padding-right: 25px;">
-					<b><tmpl_var user.label>:</b> 
-						<tmpl_if user.isVisitor>
-							<tmpl_var username>
-						<tmpl_else>
-							<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-						</tmpl_if>
-						<br />
-					<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-				</div>	
-				<div>
-					<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-					<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-						<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-						</tmpl_unless>
-						<br />
-					<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <a href="<tmpl_var approve.url>"><tmpl_var approve.label></a> | <a href="<tmpl_var deny.url>"><tmpl_var deny.label></a> ]<br />
-					<tmpl_else>	
-						<tmpl_if user.isPoster>
-							<b><tmpl_var status.label>:</b> <tmpl_var status> [ <tmpl_if isArchived> <a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-						</tmpl_if>	
-					</tmpl_if>	
-				</div>	
-			</div>
-			<div class="postMessage">
-				<tmpl_var content>
-<tmpl_loop attachment_loop>
-	<div style="float: left; padding: 5px;">
-		<a href="<tmpl_var url>">
-			<tmpl_if isImage>
-				<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-			<tmpl_else>
-				<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>">< <tmpl_var filename>
-			</tmpl_if>
-		</a>
-	</div>
-</tmpl_loop>
-<div style="clear: both;"></div>
-
-			</div>
-			<tmpl_unless isLocked>
-				<div class="postControls">
-					<tmpl_if user.canReply>
-						<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull; 
-					</tmpl_if>
-					<tmpl_if user.canEdit>
-						<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
-						<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-					</tmpl_if>
-				</div>
-			</tmpl_unless>
-		</div>
-	</tmpl_loop>
-<!-- end flat layout -->
-</tmpl_if>
-
-<tmpl_if layout.isNested>
-<!-- begin nested layout -->
-	<tmpl_loop post_loop>
-		<div style="margin-left: <tmpl_var depthX10>px;">
-			<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-				<a name="<tmpl_var assetId>"></a>
-				<div class="postSubject">
-					<tmpl_var title>
-				</div>
-				<div class="postData">
-<tmpl_if avatar.url>
-<div style="float: left; padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>
-					<div style="float: left; padding-right: 25px;">
-						<b><tmpl_var user.label>:</b> 
-							<tmpl_if user.isVisitor>
-								<tmpl_var username>
-							<tmpl_else>
-								<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-							</tmpl_if>
-							<br />
-						<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-					</div>	
-					<div>
-						<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-						<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-							<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-							</tmpl_unless>
-							<br />
-							<tmpl_if user.isPoster>
-								<b><tmpl_var status.label>:</b> <tmpl_var status> [ <tmpl_if isArchived> <a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-							</tmpl_if>	
-					</div>	
-				</div>
-				<div class="postMessage">
-					<tmpl_var content>
-<tmpl_loop attachment_loop>
-	<div style="float: left; padding: 5px;">
-		<a href="<tmpl_var url>">
-			<tmpl_if isImage>
-				<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-			<tmpl_else>
-				<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-			</tmpl_if>
-		</a>
-	</div>
-</tmpl_loop>
-<div style="clear: both;"></div>
-
-				</div>
-				<tmpl_unless isLocked>
-					<div class="postControls">
-						<tmpl_if user.canReply>
-							<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull;
-						</tmpl_if>
-						<tmpl_if user.canEdit>
-							<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
-							<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-						</tmpl_if>
-					</div>
-				</tmpl_unless>
-			</div>
-		</div>
-	</tmpl_loop>
-<!-- end nested layout -->
-</tmpl_if>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination" style="margin-top: 20px;">
-		[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-	</div>
-</tmpl_if>
-
-<div style="margin-top: 20px;" class="bottomControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> &bull;
-	</tmpl_if>	
-	<tmpl_if next.url>
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> &bull; 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a> &bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a> &bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a> &bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a> &bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-	.postBorder {
-		border: 1px solid #cccccc;
-		margin-bottom: 10px;
-	}
- 	.postBorderCurrent {
-		border: 3px dotted black;
-		margin-bottom: 10px;
-	}
-	.postSubject {
-		border-bottom: 1px solid #cccccc;
-		font-weight: bold;
-		padding: 3px;
-	}
-	.postData {
-		border-bottom: 1px solid #cccccc;
-		font-size: 9pt;
-		background-color: #eeeeee;
-		color: black;
-		padding: 3px;
-	}
-	.postData a {
-		color:#29587E;
-		text-decoration:underline;
-	}
-	.postData a:hover {
-		text-decoration:none;
-	}
-	.postControls {
-		border-top: 1px solid #cccccc;
-		background-color: #676767;
-		color: black;
-		padding: 3px;
-		text-align:right;
-	}
-	.postControls a:link, .postControls a:visited {
-		color:white;
-		text-decoration:underline;
-	}
-	.postControls a:hover {
-		text-decoration:none;
-	}
-	.bottomControls {
-		background-color:#676767;
-		padding: 3px;
-		text-align:right;
-	}
-	.bottomControls a:link, .bottomControls a:visited {
-		color:white;
-		text-decoration:underline;
-	}	
-	.bottomControls a:hover {
-		text-decoration:none;
-	}
-	.postMessage {
-		padding: 3px;
-	}
-	.currentThread {
-		background-color: #eeeeee;
-	}
-	.threadHead {
-		font-weight: bold;
-		border-bottom: 1px solid #cccccc;
-		font-size: 9pt;
-		background-color: #eeeeee;
-		color: black;
-		padding: 3px;
-	}
-	.threadData {
-		font-size: 11px;
-		padding: 3px;
-	}
-</style>
diff --git a/docs/upgrades/templates-6.99.4/job.tmpl b/docs/upgrades/templates-6.99.4/job.tmpl
deleted file mode 100644
index 1299d7eb2..000000000
--- a/docs/upgrades/templates-6.99.4/job.tmpl
+++ /dev/null
@@ -1,349 +0,0 @@
-#PBtmpl0000000000000098
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<tmpl_if user.isModerator>
-	<div style="float: right; font-size: 11px; border: 1px solid #cccccc; padding: 2px; margin: 2px;">
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	</div>
-</tmpl_if>	
-
-<tmpl_if content>
-	<b>Job Description</b><br />
-	<p><tmpl_var content></p>
-</tmpl_if>
-
-<tmpl_if userDefined3>
-	<b>Job Requirements</b><br />
-	<p><tmpl_var userDefined3></p>
-</tmpl_if>
-
-<table width="100%">
-<tr>
-	<td class="tableHeader">Date Posted</td>
-	<td class="tableData"><tmpl_var dateSubmitted.human>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Location</td>
-	<td class="tableData"><tmpl_var userDefined2>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Compensation</td>
-	<td class="tableData"><tmpl_var userDefined1>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Views</td>
-	<td class="tableData"><tmpl_var views>&#160;</td>
-</tr>
-</table>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>">
-				<tmpl_if isImage>
-					<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-				<tmpl_else>
-					<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-				</tmpl_if>
-				</a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<tmpl_if repliesAllowed>
-
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<div style="float: left; width: 50%">
-							<b><tmpl_var user.label>:</b> 
-								<tmpl_if user.isVisitor>
-									<tmpl_var username>
-								<tmpl_else>
-									<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-								</tmpl_if>
-								<br />
-							<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-						</div>	
-						<div>
-							<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-							<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<tmpl_if user.isPoster>
-									<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-								</tmpl_if>	
-						</div>	
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;">
-								<a href="<tmpl_var url>">
-								<tmpl_if isImage>
-									<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-								<tmpl_else>
-									<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-								</tmpl_if>
-								</a>							
-							</div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-							<div style="float: left; width: 50%">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-							</div>	
-							<div>
-								<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-									<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-									</tmpl_unless>
-									<br />
-									<tmpl_if user.isPoster>
-										<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-									</tmpl_if>	
-							</div>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;">
-									<a href="<tmpl_var url>">
-									<tmpl_if isImage>
-										<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-									<tmpl_else>
-										<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-									</tmpl_if>
-									</a>								
-								</div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>			
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-	font-size:9pt;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.postControls
-{
-	background:#676767;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-.postControls a:link, .postControls a:visited
-{
-	color:white;
-	text-decoration:underline;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.threadData {
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-
-.tableHeader
-{
-	width:20%;
-	background-color:#DADADA;
-	font-family:arial;
-	font-size:9pt;	
-}
-
-.tableData
-{
-	width:80%;
-	border:solid #DADADA 1px;
-	font-family:arial;
-	font-size:9pt;	
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.4/link.tmpl b/docs/upgrades/templates-6.99.4/link.tmpl
deleted file mode 100644
index 793b36a63..000000000
--- a/docs/upgrades/templates-6.99.4/link.tmpl
+++ /dev/null
@@ -1,325 +0,0 @@
-#PBtmpl0000000000000113
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<tmpl_if user.isModerator>
-	<div style="float: right; font-size: 11px; border: 1px solid #cccccc; padding: 2px; margin: 2px;">
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	</div>
-</tmpl_if>	
-
-<tmpl_if content>
-	<div class="linkContent">
-	<b>Link Description</b><br /><br />
-	<tmpl_var content><br />
-	
-	<b>Link URL</b><br /><br />
-	<a href="<tmpl_var userDefined1>"><tmpl_var userDefined1></a><br /><br />
-	</div>
-</tmpl_if>
-
-
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>">
-					<tmpl_if isImage>
-						<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-					<tmpl_else>
-						<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-					</tmpl_if>
-				</a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<tmpl_if repliesAllowed>
-
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<div style="float: left; width: 50%">
-							<b><tmpl_var user.label>:</b> 
-								<tmpl_if user.isVisitor>
-									<tmpl_var username>
-								<tmpl_else>
-									<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-								</tmpl_if>
-								<br />
-							<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-						</div>	
-						<div>
-							<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-							<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<tmpl_if user.isPoster>
-									<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-								</tmpl_if>	
-						</div>	
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;">
-								<a href="<tmpl_var url>">
-									<tmpl_if isImage>
-										<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-									<tmpl_else>
-										<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-									</tmpl_if>
-								</a>
-							</div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull; 
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-							<div style="float: left; width: 50%">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-							</div>	
-							<div>
-								<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-									<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-									</tmpl_unless>
-									<br />
-									<tmpl_if user.isPoster>
-										<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-									</tmpl_if>	
-							</div>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;">
-									<a href="<tmpl_var url>">
-										<tmpl_if isImage>
-											<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-										<tmpl_else>
-											<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-										</tmpl_if>
-									</a>
-								</div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>">List All Links</a>
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		&bull;
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.postControls
-{
-	background:#676767;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-.postControls a:link, .postControls a:visited
-{
-	color:white;
-	text-decoration:underline;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.threadData {
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-.linkContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-.linkContent a
-{
-	color:#29587E;
-}
-h2
-{
-	font-family:arial;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.4/mail_form.tmpl b/docs/upgrades/templates-6.99.4/mail_form.tmpl
deleted file mode 100644
index 32dfad405..000000000
--- a/docs/upgrades/templates-6.99.4/mail_form.tmpl
+++ /dev/null
@@ -1,97 +0,0 @@
-#PBtmpl0000000000000020
-<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 error_loop>
-<ul class="fontSettings">
-<tmpl_loop error_loop>
-	<li><b><tmpl_var error.message></b>
-</tmpl_loop>
-</ul>
-</tmpl_if>
-
-<tmpl_if description>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<tmpl_if canEdit>
-	<div class="dataControls">
-		<a href="<tmpl_var entryList.url>"><tmpl_var entryList.label></a>
-		&bull; <a href="<tmpl_var export.tab.url>"><tmpl_var export.tab.label></a>
-		<tmpl_if entryId>
-			&bull; <a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-			&bull; <a href="<tmpl_var addField.url>"><tmpl_var addField.label></a>
-			&bull; <a href="<tmpl_var addTab.url>"><tmpl_var addTab.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_if>
-
-<tmpl_var form.start>
-<table class="mailForm">
-<tmpl_loop field_loop>
-	<tmpl_unless field.isHidden>
-		<tr><td class="formDescription" valign="top">
-		<tmpl_if session.var.adminOn><tmpl_if canEdit><tmpl_var field.controls></tmpl_if></tmpl_if>
-		<tmpl_var field.label>
-		</td><td class="tableData" valign="top">
-		<tmpl_if field.isDisplayed>
-			<tmpl_var field.value>
-		<tmpl_else>
-			<tmpl_var field.form>
-		</tmpl_if>
-		<tmpl_if field.isRequired>*</tmpl_if>
-		<span class="formSubtext"><br /><tmpl_var field.subtext></span>
-		</td></tr>
-	</tmpl_unless>
-</tmpl_loop>
-<tr><td></td><td><tmpl_var form.send></td></tr>
-</table>
-
-<tmpl_var form.end>
-~~~
-<style type="text/css">
-h2{
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.fontSettings{
-	font-family:arial;
-	font-size:9pt;
-}
-.mailForm td{
-	font-family:arial;
-	font-size:9pt;
-}
-.dataControls
-{
-	-moz-box-sizing:border-box;
-	background:#676767;
-	color:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-.dataControls a
-{
-	color:white;
-	font-size:8pt;
-	text-decoration:underline;
-}
-.dataControls a:hover {
-	text-decoration:none;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.4/request_tracker_post.tmpl b/docs/upgrades/templates-6.99.4/request_tracker_post.tmpl
deleted file mode 100644
index ce27a40ef..000000000
--- a/docs/upgrades/templates-6.99.4/request_tracker_post.tmpl
+++ /dev/null
@@ -1,386 +0,0 @@
-#PBtmpl0000000000000209
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<div class="defaultSubmissionDetails">
-<tmpl_if avatar.url>
-<div style="width: 100%; text-align: center;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>	
-	<b><tmpl_var user.label>:</b> 
-		<tmpl_if user.isVisitor>
-			<tmpl_var username>
-		<tmpl_else>
-			<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-		</tmpl_if>
-		<br />
-	<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-	<b><tmpl_var severity.label>:</b> <tmpl_var userDefined1><br />
-	<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-	<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-		<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-		</tmpl_unless>
-		<br />
-	<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> &nbsp; &nbsp; [ <a href="<tmpl_var unarchive.url>"><tmpl_var open.label></a> <tmpl_else> <tmpl_var open.label> &nbsp; &nbsp; [ <a href="<tmpl_var archive.url>"><tmpl_var close.label></a></tmpl_if> ]<br />
-	<tmpl_else>	
-		<tmpl_if user.isPoster>
-			<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> <tmpl_else> <tmpl_var open.label></tmpl_if><br />
-		</tmpl_if>	
-	</tmpl_if>	
-<tmpl_if karmaIsEnabled>
-	<b><tmpl_var karmaRank.label>:</b> <tmpl_var karmaRank><br />
-<b><tmpl_var transferkarma.label>:</b>
-<tmpl_var transfer.karma.form>
-</tmpl_if>	
-</div>
-
-<div class="collaborationThreadContent">
-	<tmpl_var content>
-</div>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>">
-					<tmpl_if isImage>
-						<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-					<tmpl_else>
-						<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-					</tmpl_if>
-				</a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<div style="clear:both;"></div>
-
-<tmpl_if repliesAllowed>
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-<tmpl_if avatar.url>
-<td style="padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</td>
-</tmpl_if>
-							<td style="padding-right: 25px;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>	
-								<br />									
-							</td>
-						</tr>
-						</table>
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;">
-								<a href="<tmpl_var url>">
-									<tmpl_if isImage>
-										<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-									<tmpl_else>
-										<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-									</tmpl_if>
-								</a>
-							</div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-<tmpl_if avatar.url>
-<td style="padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</td>
-</tmpl_if>
-							<td style="padding-right: 25px;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>	
-								<br />
-							</td>
-						</tr>
-						</table>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;">
-									<a href="<tmpl_var url>">
-										<tmpl_if isImage>
-											<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-										<tmpl_else>
-											<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-										</tmpl_if>
-									</a>
-								</div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>
-	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a>				
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-.defaultSubmissionDetails
-{
-	float: right; 		
-	padding: 2px; 
-	margin: 2px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:20px;
-}
-
-.defaultSubmissionDetails a
-{
-	color:#29587E;
-}
-
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	background-color: #eeeeee;
-	padding: 3px;
-}
-.postData td {
-	font-size: 9pt;
-	color: black;
-	font-family:arial;
-}
-.postControls {
-	border-top: 1px solid #cccccc;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-	clear:both;
-	width:100%;
-display:block;
-	-moz-box-sizing:border-box;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.threadData {
-	font-size: 11px;
-	padding: 3px;
-	font-family:arial;
-}
-
-.postControls
-{
-	background:#676767;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-.postControls a:link, .postControls a:visited
-{
-	color:white;
-	text-decoration:underline;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.collaborationThreadContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-</style>
diff --git a/docs/upgrades/templates-6.99.4/tab_form.tmpl b/docs/upgrades/templates-6.99.4/tab_form.tmpl
deleted file mode 100644
index f18326127..000000000
--- a/docs/upgrades/templates-6.99.4/tab_form.tmpl
+++ /dev/null
@@ -1,129 +0,0 @@
-#PBtmpl0000000000000116
-<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 error_loop>
-	<ul class="fontSettings">
-		<tmpl_loop error_loop>
-			<li><b><tmpl_var error.message></b></li>
-		</tmpl_loop>
-	</ul>
-</tmpl_if>
-
-<tmpl_if description>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<tmpl_if canEdit>
-	<div class="dataControls">
-		<a href="<tmpl_var entryList.url>"><tmpl_var entryList.label></a>
-			&bull; <a href="<tmpl_var export.tab.url>"><tmpl_var export.tab.label></a>
-		<tmpl_if entryId>
-			&bull; <a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-		<tmpl_if session.var.adminOn>
-			&bull; <a href="<tmpl_var addField.url>"><tmpl_var addField.label></a>
-			&bull; <a href="<tmpl_var addTab.url>"><tmpl_var addTab.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_if>
-<tmpl_var form.start>
-
-<div class="tabs">
-	<tmpl_loop tab_loop>
-		<span onclick="toggleTab(<tmpl_var tab.sequence>)" id="tab<tmpl_var tab.sequence>" class="tab"><tmpl_var tab.label>
-		<tmpl_if session.var.adminOn>
-			<tmpl_if canEdit>
-				<tmpl_var tab.controls>
-			</tmpl_if>
-		</tmpl_if>
-		</span>
-	</tmpl_loop>
-</div>
-<tmpl_loop tab_loop>
-	<tmpl_var tab.start>
-		<table class="tabForm">
-			<tmpl_loop tab.field_loop>
-				<tmpl_unless tab.field.isHidden>
-						<tr>
-							<td class="formDescription" valign="top">
-								<tmpl_if session.var.adminOn>
-									<tmpl_if canEdit>
-										<tmpl_var tab.field.controls>
-									</tmpl_if>
-								</tmpl_if>
-								<tmpl_var tab.field.label>
-							</td>
-							<td class="tableData" valign="top">
-								<tmpl_if tab.field.isDisplayed>
-									<tmpl_var tab.field.value>
-								<tmpl_else>
-									<tmpl_var tab.field.form>
-								</tmpl_if>
-								<tmpl_if tab.field.isRequired>*</tmpl_if>
-								<span class="formSubtext">
-									<br />
-									<tmpl_var tab.field.subtext>
-								</span>
-							</td>
-						</tr>
-				</tmpl_unless>
-			</tmpl_loop>
-			<tr>
-				<td colspan="2">
-					<span class="tabSubtext"><tmpl_var tab.subtext></span>
-				</td>
-			</tr>
-		</table>
-		<br />
-		<tmpl_var form.save>
-	<tmpl_var tab.end>
-</tmpl_loop>
-<tmpl_var tab.init>
-<tmpl_var form.end>
-~~~
-<style type="text/css">
-h2{
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.fontSettings{
-	font-family:arial;
-	font-size:9pt;
-}
-.tabForm td{
-	font-family:arial;
-	font-size:9pt;
-}
-.dataControls
-{
-	-moz-box-sizing:border-box;
-	background:#676767;
-	color:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-.dataControls a
-{
-	color:white;
-	font-size:8pt;
-	text-decoration:underline;
-}
-.dataControls a:hover {
-	text-decoration:none;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.4/wgtemplate_default_pm_project_display.tmpl b/docs/upgrades/templates-6.99.4/wgtemplate_default_pm_project_display.tmpl
deleted file mode 100644
index 9cea4a6e6..000000000
--- a/docs/upgrades/templates-6.99.4/wgtemplate_default_pm_project_display.tmpl
+++ /dev/null
@@ -1,660 +0,0 @@
-#ProjectManagerTMPL0002
-<script type="text/javascript">
-    var dayMS = 86400000;
-	
-	var popTitle = "Add/Edit Task";
-	
-	var dunits = "<tmpl_var project.durationUnits>";
-	var hoursPerDay = <tmpl_var project.hoursPerDay>;
-	var taskLength=<tmpl_var project.task.length>;
-	
-   //--------------------------------------------------------------------------------------	
-	function doCalendar (fieldId) {
-	   Calendar.setup({ 
-                         inputField : fieldId, 
-                         ifFormat : "%Y-%m-%d", 
-                         showsTime : false, 
-                         step : 1,
-                         timeFormat : "12",
-                         firstDay : false
-                    }); 
-    }
-	
-   //--------------------------------------------------------------------------------------	
-    function buildMenuUrl (urltype,taskId) {
-       if(urltype == "edit") {
-	      alert("edit task: "+taskId);
-	   } else if(urltype == "insertAbove") {
-	      alert("insert task above: "+taskId);
-	   } else if(urltype == "insertBelow") {
-	      alert("insert task below: "+taskId);
-	   } else if(urltype == "delete") {
-	      alert("delete task: "+taskId);
-	   }
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function closeImage() {
-       return '<tmpl_var extras>/close.gif';
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function configureMilestone(box) {
-	   var form = box.form;
-	   if(box.checked==true) { 
-	      form.end.value=form.start.value; 
-		  form.duration.value=0; 
-		  form.duration.disabled=true; 
-		  form.end.disabled=true;
-		  form.dependants.disabled=true;
-		  form.resource.disabled=true;
-		  form.percentComplete.disabled=true;
-		  form.percentComplete.value=0;
-	   } else { 
-	      form.end.disabled=false; 
-		  form.duration.disabled=false; 
-		  form.dependants.disabled=false;
-		  form.resource.disabled=false;
-		  form.percentComplete.disabled=false;
-		  form.duration.value = (dunits == "hrs")?hoursPerDay:1;
-	   }
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function checkEditTaskForm (form) {
-	   if(form.name.value == "") {
-	      alert("<tmpl_var form.name.error>");
-		  return;
-	   } else if(form.start.value == "") {
-	      alert("<tmpl_var form.start.error>");
-		  return;
-	   } else if(form.milestone.checked==false && form.end.value == "") {
-	      alert("<tmpl_var form.end.error>");
-		  return;
-	   }
-	   form.submit();
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function intlDate(dateObj) {
-	   return dateObj.getFullYear()+"-"+pad((dateObj.getMonth()+1))+"-"+pad(dateObj.getDate());
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function toDateObj(date) {
-	   var to = date.split("-");
-	   var dateObj = new Date(to[0],(to[1]-1),to[2],0,0,1,0);
-	   return dateObj;
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function adjustTaskTimeFromDuration(start, end, duration, isTaskForm, predecessor, origStart, origEnd, seqNum) {
-	   //set the form element
-	   var form = duration.form;
-	   
-	   //get today's date
-	   var today = new Date();
-	   var todayIntl = intlDate(today);
-	   //set start and end date if not already set
-	   if(start.value == "") start.value = todayIntl;
-	   if(end.value == "") end.value = todayIntl;
-	   	   
-	   //Convert predecessor hours to days
-	   var taskDuration = duration.value;
-	   if(dunits == "hrs") taskDuration = taskDuration / hoursPerDay;
-	   var durationFloor = Math.floor(taskDuration);
-	   
-	   //Handle task form and main form seperately due to differences in the forms
-	   if(isTaskForm && taskDuration <= 0) {
-	      //Convert to milestone if task is less or equal to zero
-	      if(confirm("Zero duration tasks are considered Milestones.  Do you wish to change this task to a milestone?")) {
-		     form.milestone.checked = true;
-			 configureMilestone(form.milestone);
-		  } else {
-			 duration.value = form.orig_duration.value;
-	      }
-		  return;
-	   } else if (taskDuration <= 0){
-	      //Do not let users zero out tasks
-		  alert("Zero duration tasks are considered Milestones.  Please edit the task by clicking the link if you wish to change this task to a milestone");
-		  return;
-	   }
-	   
-	   //create the start date 
-	   var aTo = start.value.split("-");
-	   var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-       
-	   //add new duration days to the start date
-       toDate.setDate(toDate.getDate() + durationFloor);
-			  
-	   //set end date to this date
-	   end.value = intlDate(toDate);
-	   
-	   //Set new duration in taskArray
-	   taskArray[seqNum]["duration"] = duration.value;
-	   //Adjust time based on new end date
-	   adjustTaskTimeFromDate(start, end, duration, end, isTaskForm, predecessor, origStart, origEnd, seqNum);
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function adjustTaskTimeFromDate (start, end, duration, element, isTaskForm, predecessor, origStart, origEnd, seqNum) {
-	   //set the form element
-	   var form = element.form;
-	   //set original duration from task form to determine whether or not to continue to set duration
-	   var orig_duration;
-	   
-	   if(isTaskForm) {
-	      if(form.milestone.checked == true) return;
-          orig_duration = form.orig_duration.value;
-	   }
-	   
-	   //Handle case where both start and end are empty
-	   if(start.value == "" && end.value == "") {
-	      //get today's date
-	      var today = new Date();
-	      var todayIntl = intlDate(today);
-	      //set start and end date if not already set
-		  start.value = todayIntl;
-		  end.value = todayIntl;
-	   }
-	   
-	   //Handle case where one is set and the other isn't
-	   if (end.value == "") end.value = start.value;
-	   if(start.value == "") start.value = end.value;
-	   
-	   if(isTaskForm && orig_duration == "") {
-	      //Set duration if this is a new record
-		  //Check to make sure start date comes before end date
-		  var startcomp = start.value.replace(/-/g,"");
-	      var endcomp = end.value.replace(/-/g,"");
-	      if(startcomp > endcomp) {
-	         alert("<tmpl_var form.greaterthan.error>");
-		     if(element.name == "start") {
-		        end.value = element.value;
-		     } else {
-		        start.value = element.value;
-		     }
-		     duration.value = (dunits == "hrs")?hoursPerDay:1;
-		     return;
-	      }
-	   
-	      var d = getDaysInterval(start.value,end.value);
-		  if(d == 0) d = 1;
-	      if(dunits == "hrs") {
-	         d = d * hoursPerDay;
-	      }
-	      duration.value = d;
-	   } else {
-	      //Set start/end if duration has been saved
-		  var d = duration.value; 
-		  if(dunits == "hrs") {
-		     //Convert to days
-		     d = d / hoursPerDay;
-		  }
-	      //Round off duration or set it to zero if less than 1;
-		  //alert("d = " + d + " floor = " + Math.floor(d));
-		  if(d < 1) d = 0;
-		  else d = Math.floor(d);
-		  
-		  if(element.name.indexOf("start") > -1) {
-		     //create the date 
-			  var aTo = start.value.split("-");
-			  var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-             //add duration days to the start date
-              toDate.setDate(toDate.getDate() + d);
-			  //set end date to this date
-			  end.value = intlDate(toDate);
-		  } else if(element.name.indexOf("end") > -1) {
-		      //create the date
-			  var aFrom = end.value.split("-");
-			  var fromDate = new Date(aFrom[0],(aFrom[1]-1),aFrom[2],0,0,1,0);
-			  //subtract duration days from the end date
-			  fromDate.setDate(fromDate.getDate() - d);
-			  //set start date to this date
-			  start.value = intlDate(fromDate);
-		  }
-	   }
-	   
-	   //Check Predecessors before moving stuff
-	   var pred = predecessor.value;
-	   if(pred != "") {
-		  //Check to make sure that the dependency requirement for this task is still valid
-		  //Get the predecessor end date
-	      var taskStart = toDateObj(start.value);
-		  var predTaskEnd;
-		  if(isTaskForm) {
-		     predTaskEnd = toDateObj(taskArray[pred]["end"]);
-		  } else {
-		     var predTaskEndId = "end_"+taskArray[pred]["id"]+"_formId"
-		     predTaskEnd = toDateObj(document.getElementById(predTaskEndId).value);
-		  }
-		  
-		  if(taskStart.getTime() < predTaskEnd.getTime()) {
-		     alert("<tmpl_var form.invalidMove.error>");
-			 start.value = origStart.value;
-			 end.value = origEnd.value;
-			 return;
-		  }
-	   }
-	   
-	   //Check all tasks past this one and move them forward if necessary (this only needs to happen on the main form)
-	   if(!isTaskForm) {
-	      arrangePredecessors(element,seqNum);
-	   }
-	   //reset orig start and end values
-	   origStart.value = start.value;
-	   origEnd.value = end.value;
-	   
-	   if(!isTaskForm) {
-	      //Adjust task form for 
-	      paintGanttChart();
-	   }
-	}
-   
-   //--------------------------------------------------------------------------------------
-   function trim(str) {
-      return str.replace(/^\s+|\s+$/, '');
-   }
-	
-   //--------------------------------------------------------------------------------------
-   function arrangePredecessors (element,seqNum) {
-	  for (var i = 1; i <= taskLength; i++) {
-	     var seq = i;
-		 var task = taskArray[seq];
-		 var taskId = task["id"];
-		 //Calculate duration and duraiton floor
-		 var durationInDays = parseFloat(task["duration"]);
-		 if(dunits == "hrs") durationInDays = durationInDays / hoursPerDay;
-		 var durationFloor = Math.floor(durationInDays);
-		 //alert("Duration Floor is: "+durationFloor);
-		 //Get the current elements
-		 var currElementStart = document.getElementById("start_"+taskId+"_formId");
-	     var currElementEnd = document.getElementById("end_"+taskId+"_formId");
-		 //alert("Current Start Date: "+currElementStart.value+"   Current End Date: "+currElementEnd.value);
-		 //Skip the first record as it is the record that was changed
-		 if(seq > 1) {
-		    var predecessor = task["predecessor"];
-			//alert("predecessor for "+i+" is "+predecessor);
-			if(predecessor != "") {
-			   var pred = taskArray[predecessor];
-			   var predEndDate = toDateObj(pred["end"]);
-			   var startDate = toDateObj(task["start"]);
-			   //alert ("Pred End Date: "+intlDate(predEndDate));
-			   //Make sure start date of this task is greater than the end date of the predecessor
-			   if(startDate.getTime() <= predEndDate.getTime()) {
-			      //Change the start and end dates of the task
-				  //Get the day part of the predecessor
-				  var predDayPart = parseFloat(pred["dayPart"]);
-				  //alert("predDayPart: "+predDayPart);
-				  if(predDayPart > 0) {
-				     //The previous task took up part of a day.  Add the additional day part to the duration
-					 durationInDays += predDayPart;
-					 durationFloor = Math.floor(durationInDays);
-				  }
-				  //alert("Duration in Days: "+durationInDays+" Duration Floor: "+durationFloor);
-				  //Set the start date of this task to the end date of the predecessor
-				  currElementStart.value = pred["end"];
-				  //Adjust end date for change in start date and update the object - start date is actually predEndDate now, so use the existing date object
-				  predEndDate.setDate(predEndDate.getDate() + durationFloor);
-				  currElementEnd.value = intlDate(predEndDate);
-				 //alert("Set seq "+i+" to start: "+pred["end"]+" end: "+intlDate(predEndDate));
-			   }
-			}
-		 }
-		  
-		 //Update task array with new start/end values
-		 taskArray[seq]["start"] = currElementStart.value;
-		 taskArray[seq]["end"] = currElementEnd.value;
-		 taskArray[seq]["dayPart"] = (durationInDays - Math.floor(durationInDays));
-	  }
-   }
-	
-   //--------------------------------------------------------------------------------------	
-	function getDaysInterval(from,to) {
-       var aFrom = from.split("-");
-	   var aTo = to.split("-");
-	   var fromDate = new Date(aFrom[0],(aFrom[1]-1),aFrom[2],0,0,1,0);
-	   var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-	   var fromEpoch = fromDate.getTime();
-	   var toEpoch = toDate.getTime();
-	  
-	   var seconds = toEpoch - fromEpoch;
-	   if(seconds == 0) return 0;
-	   return (seconds/dayMS);
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function pad(date) {
-       var str = ""+date;
-       if(str.length == 1) {
-	      str = "0"+str;
-	   }
-	   return str;
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function paintGanttChart () {
-	   var status = AjaxRequest.submit(document.forms['editAll'],{
-                                      'onSuccess':function(req){ document.getElementById('gantt').innerHTML = req.responseText; }
-                                     });
-       
-	   var mwidth = document.getElementById("projectTableWidth").name + "px";
-	   var swidth = document.getElementById("projectScrollPercentWidth").name + "%";
-	   document.getElementById("mastertable").style.width=mwidth;
-	   document.getElementById("scrolltd").style.width=swidth;
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function validateDependant(field,origField,seqNum,start,end,duration,isTaskForm,origStart,origEnd) {
-	   var pred = field.value;
-	   var newTask = false;
-	   if(pred != "") {
-	      if(seqNum == "") seqNum = taskLength+1;
-		  if(pred < 1) {
-	         alert("<tmpl_var form.noPredecessor.error>");
-		     field.value=origField.value;
-		     return;
-	      }
-	      if(pred == seqNum) {
-	         alert("<tmpl_var form.samePredecessor.error>");
-		     field.value=origField.value;
-		     return;
-	      }
-	      if(pred > seqNum) {
-	         alert("<tmpl_var form.previousPredecessor.error>");
-		     field.value = origField.value;
-		     return; 
-	      }
-		  
-	      //Set defaults if it's a new record and one of the other options hasn't been checked.
-	      if(start.value == "" || end.value == "") {
-             //get today's date
-			 newTask = true;
-			 duration.value = (dunits == "hrs")?hoursPerDay:1; 
-		  }
-	      //Get the predecessor end date and decide where the new start date belongs
-	      var taskStart = start.value;
-		  var taskStartObj = toDateObj(taskStart);
-		  var predTaskEnd = taskArray[pred]["end"];
-		  var predTaskEndObj = toDateObj(predTaskEnd);
-		  
-		  //Change start date if it comes before predecessor end date
-		  if(newTask || (taskStartObj.getTime() < predTaskEndObj.getTime())) {
-		     
-			 //Convert predecessor hours to days
-	         var taskDuration = duration.value;
-			 if(dunits == "hrs") taskDuration = taskDuration / hoursPerDay;
-			 var durationFloor = Math.floor(taskDuration);
-			 
-			 //Get the predecessor dayPart
-			 var predDayPart = parseFloat(pred["dayPart"]);
-		     if(predDayPart > 0) {
-		        //The previous task took up part of a day.  Add the additional day part to the duration
-			    taskDuration += predDayPart;
-				durationFloor = Math.floor(durationInDays);
-			 }
-	         
-			 //Set the start date of this task to the end date of the predecessor
-		     start.value = predTaskEnd;
-			 //Adjust end date for change in start date
-	         adjustTaskTimeFromDate(start,end,duration,start,isTaskForm,field,origStart,origEnd,seqNum);
-			 return;
-		  }
-	   }
-	   
-	   //Repaint
-	   if(!isTaskForm) {
-	      //Set new predecessor in taskArray
-	      taskArray[seqNum]["predecessor"] = pred;
-	      paintGanttChart();
-	   }
-	}
-   
-    addEvent(window, "load", initPopUp);
-</script>
-<tmpl_var form.header>
-<table cellpadding="0" cellspacing="0" border="0" class="project" id="mastertable" style="width:<tmpl_var project.table.width>px;">
-   <tbody>
-      <tr>
-         <td style="width:20px;height:20px;">&nbsp;</td>
-	     <td style="width:300px;" align="center">Task Name</td>
-	     <td style="width:70px;" align="center">Duration</td>
-	     <td style="width:70px;" align="center">Start</td>
-	     <td style="width:70px;" align="center">Finish</td>
-	     <td style="width:30px;" align="center">Pred</td>
-	     <td rowspan="<tmpl_var project.gaant.rowspan>" valign="top" id="scrolltd" style="border-style:none;width:<tmpl_var project.scroll.percentWidth>%;">
-	        <div class="scroller" id="gantt">
-			   <tmpl_var project.ganttChart>
-		    </div>
-	     </td>
-      </tr>
-      <tr>
-	     <td colspan="6">&nbsp;</td>
-      </tr>
-      <tmpl_loop task.loop>
-      <tr id="<tmpl_var task.row.id>">
-	     <td align="center" style="height:20px"><tmpl_var task.number></td>
-	     <td align="left" style="height:20px">
-	        <tmpl_if task.canAdd>
-		       <script type="text/javascript">
-                   var cMenu = new cMenu_createWithLink("id_<tmpl_var task.number>","<tmpl_var task.name>");
-				   cMenu.addLink("<tmpl_var task.edit.url>","<tmpl_var task.edit.label>");
-				   cMenu.addLink("<tmpl_var task.insertAbove.url>","<tmpl_var task.insertAbove.label>");
-				   cMenu.addLink("<tmpl_var task.insertBelow.url>","<tmpl_var task.insertBelow.label>");
-				   cMenu.addLink("<tmpl_var task.delete.url>","<tmpl_var task.delete.label>");
-				   cMenu.print();
-               </script>
-			   <!-- <a href="<tmpl_var task.edit.url>" class="submodal"><tmpl_var task.name></a> -->
-		    <tmpl_else>
-		       <tmpl_var task.name>
-		    </tmpl_if>
-	     </td>
-	     <td align="center" style="height:20px"><tmpl_var task.duration> <tmpl_var task.duration.units></td>
-	     <td align="center" style="height:20px"><tmpl_var task.start></td>
-	     <td align="center" style="height:20px"><tmpl_var task.end></td>
-	     <td align="center" style="height:20px"><tmpl_var task.dependants></td>	
-      </tr>
-      </tmpl_loop>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-   </tbody>
-</table>
-<tmpl_var form.footer>
-
-<div id="links">
-<!-- 	<tmpl_if project.canEdit><a href="<tmpl_var task.resources.url>"><tmpl_var task.resources.label></a>&nbsp;|&nbsp;</tmpl_if> -->
-	<tmpl_if task.canAdd><a href="<tmpl_var task.add.url>" class="submodal"><tmpl_var task.add.label></a>&nbsp;|&nbsp;</tmpl_if>
-	<a href="<tmpl_var task.back.url>"><tmpl_var task.back.label></a>
-</div>
-
-~~~
-<style type="text/css">
-	body, html {
-		margin:0px;
-		padding:0px;
-	}
-	.project {
-		position:relative;
-		margin-top:5px;
-		margin-left:5px;
-	}
-	.project td {
-		border:solid silver 1px;
-		border-bottom:solid gray 1px;
-		font-size:9pt;
-		font-family:arial;		
-	}
-	.project a {
-	    color:#000000;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.project a:hover {
-	    color:#7AB7E9;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.taskname {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 295px;
-    }
-	.taskduration {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 25px;
-	}
-	.taskdate {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 68px;
-	}
-	.taskdependant {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 20px;
-	}
-	tr.monthNames td {		
-		text-align:center;		
-	}
-	tr.dates td {
-		width:16px;
-	}
-	div.scroller {		
-		overflow:scroll;		
-		position:relative;
-		width:400px;		
-	}
-	
-	* html div.scroller {
-		overflow-x:scroll;
-	}
-	
-	td.empty {
-		background-color:transparent;
-		border-style:none;
-		height:20px;
-	}
-	
-	div.barPositions {
-		position:relative;
-	}
-	div.projectBar {
-		background-color:#7AB7E9;
-		position:absolute;
-		height:10px;
-		z-index:2;
-		padding:0px;
-		margin:0px;
-		font-size:1pt;
-	}
-	div.statusBar {	
-		background-color:#000;
-		position:absolute;	
-		height:5px;
-		z-index:3;
-		padding:0px;
-		top:2px;
-		margin:0px;		
-		font-size:1pt;		
-	}
-	
-	div.projectLineH {		
-		background: url('images/dot.gif') top repeat-x;		
-		font-size:1pt;
-		text-align:right;
-		position:absolute;
-	}		
-	div.projectLineV {
-		width:1px;
-		background-color:black;
-		position:relative;
-		font-size:1pt;	
-		height:100%;
-		float:right;
-	}
-	
-	div.projectLabel {
-		position:absolute;
-		margin-top:-3px;
-		white-space:nowrap;
-		font-family: verdana;
-		font-size:8px;
-	}
-	
-	div.milestone {
-		color:#000000;
-		position:absolute;
-		z-index:4;
-		margin:0px;
-		padding:0px;		
-		margin-top:-3px;
-		font-size: 10px;
-		font-family: times;
-	}
-	
-	#links {
-		margin-top:7px;
-		margin-left:5px;
-		font-family:arial;
-		font-size:9pt;
-	}
-	
-	#links a {
-		color:#7AB7E9;
-	}
-</style>
-
-<style>
-.popUp {
-			width:100%;
-			border:solid black 0px;
-			background-color:#F5F5F5;
-		}
-		.popUp td {
-			font-size:9pt;	
-			font-family:arial;
-			border-top:solid #E0E0E0 1px;
-		}	
-		.popUp tr.clear td {
-			border-style:none;
-			background-color:#F0F0F0;
-		}
-		.popUp tr.clearNoBG td {
-			border-style:none;
-		}
-		.popUp td.header {
-			font-weight:bold;
-		}
-		a.saveBtn {
-			width:40px;
-			height:15px;
-			background-color:silver;
-			padding:1px;
-			padding-left:5px;
-			padding-right:5px;
-			color:white;
-			border:solid gray 1px;
-			text-decoration:none;
-			font-weight:bold;
-			display:block;
-			float:right;
-			text-align:center;
-		}
-		a.saveBtn:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-</style>
diff --git a/docs/upgrades/templates-6.99.5/EMS_search.tmpl b/docs/upgrades/templates-6.99.5/EMS_search.tmpl
deleted file mode 100644
index 1608eddbb..000000000
--- a/docs/upgrades/templates-6.99.5/EMS_search.tmpl
+++ /dev/null
@@ -1,450 +0,0 @@
-#EventManagerTmpl000006
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if session.var.adminOn>
-        <p><tmpl_var controls></p><br /><br />
-</tmpl_if>
-
-<tmpl_if badgeSelected>
-<table border="0" cellpadding="5" cellspacing="0" width="100%">
-<tr>
-	<td style="width:50%;" valign="top">
-		<div class="badge">
-			<tmpl_loop badgeHolderInfo_loop>
-			<h2><tmpl_var mainEventTitle><br /><tmpl_var firstName> <tmpl_var lastName></h2>
-
-			<!-- USER DATA -->
-			<div class="badgeContent" style="background-color:#E5E5E5;">
-				<table cellpadding="1" cellspacing="3" width="100%" class="userData">
-				<tbody>
-				<tr>
-					<td style="width:65px;">&nbsp;Address</td>
-					<td class="data">&nbsp;<tmpl_var address></td>
-				</tr>
-				<tr>
-					<td>&nbsp;City</td>
-					<td class="data">&nbsp;<tmpl_var city></td>
-				</tr>
-				<tr>
-					<td>&nbsp;State</td>
-					<td class="data">&nbsp;<tmpl_var state></td>
-				</tr>
-				<tr>
-					<td>&nbsp;ZIP</td>
-					<td class="data">&nbsp;<tmpl_var zipCode></td>
-				</tr>
-				<tr>
-					<td>&nbsp;Phone</td>
-					<td class="data">&nbsp;<tmpl_var phone></td>
-				</tr>
-				<tr>
-					<td>&nbsp;Country</td>				
-					<td class="data">&nbsp;<tmpl_var country></td>
-				</tr>			
-				</tbody>
-				</table>
-			</tmpl_loop>
-			</div>
-			<!-- END USER DATA -->
-			
-			<!-- BADGE EVENT -->
-			<tmpl_loop eventsInBadge_loop>
-			<div class="badgeContent">
-				<table cellpadding="0" cellspacing="0" width="100%">
-				<tbody>
-				
-				<tr>
-					<td style="width:43%;text-align:left;"><tmpl_var title></td>
-					<td style="width:40%;text-align:right;">^D("%W %Z",<tmpl_var startDate>);</td>
-					<td style="width:17%;text-align:right;"><tmpl_if removeEventFromBadge.url><a href="<tmpl_var removeEventFromBadge.url>">Remove</a></tmpl_if></td>
-				</tr>
-				
-				</tbody>
-				</table>
-			</div>
-			</tmpl_loop>
-			<!-- END BADGE EVENT -->
-			
-
-			<!-- BADGE FOOTER -->
-			<div class="badgeFooter">
-				<table cellpadding="0" cellspacing="0" width="100%">
-				<tbody>
-				<tr>
-					<td style="width:50%;"><a href="<tmpl_var resetScratchCartUrl>" style="float:left;">Start Over</a></td>
-					<td style="width:50%;"><a href="<tmpl_var continue.url>" style="float:right;">Add Contents to Cart</a></td>					
-				</tr>
-				</tbody>
-				</table>	
-			</div>
-			<!-- END BADGE FOOTER -->
-		</div>
-	</td>
-	<td style="width:50%;" valign="top">			
-			<tmpl_if cart.purchaseLoop>
-			<div class="cart">
-				<h2>Shopping Cart</h2>
-				<tmpl_loop cart.purchaseLoop>
-				<div class="cartContent">
-					<tmpl_var deleteIcon><tmpl_var editIcon> <tmpl_var purchase.mainEventTitle> <br />
-					<tmpl_loop registrantInfoLoop>
-					Name: <tmpl_var firstName> <tmpl_var lastName>
-					</tmpl_loop>
-					<br />Additional Price: $<tmpl_var newPrice> 
-				</div>
-				</tmpl_loop>
-				<!-- OEOS -->
-				<div style="text-align:right;margin:0px;">
-					<a href="<tmpl_var emptyCart.url>">Empty Cart</a> &bull; <a href="<tmpl_var checkout.url>">Checkout</a>
-				</div>
-			</div>
-			</tmpl_if>
-			<br />
-			<div class="eventSearch">
-					<h2>Search Instructions</h2>
-			
-					<span style="font-style: italic; font-weight: bold">Basic Search</span> - This is the events search screen. There is a basic search box which allows you to search by event number, event title, and event description.<br /><br />
-
-					<span style="font-style: italic; font-weight: bold">Advanced Search</span> - Click on <span style="color: blue">Advanced Search</span> and you will see a pull-down list appear in the search area. Select which event characteristic you would like to search by and then in the next drop-down box specify what type of search to do (equals, contains, is not, not like, starts with, ends with). Most searches will likely be "<span style="font-style: italic;">contains</span>."
-		</div>
-		<br />
-
-	</td>
-</tr>
-<tr>
-	<td colspan="2">
-		<div class="eventSearch">
-			<h2>Search</h2>
-			
-<script type="text/javascript" src="<tmpl_var ems.wobject.dir>/script/dynamicForms.js"></script>
-
-<script type="text/javascript">
-function popUp(URL) {
-day = new Date();
-id = day.getTime();
-eval("page" + id + " = window.open(URL, '" + id + "', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=500')");
-}
-
-   <tmpl_var search.filters.options>
-   var advanced = 0;
-   var filterCount = 0;
-
-	function setSelectValue(selObj,newValue) {
-		for (var i=0; i<selObj.options.length; i++) {
-			selObj.options[i].selected = (selObj.options[i].value==newValue)?true:false;
-		}
-	}
-	
-
-   function toggleTitle(obj) {
-      if (obj.checked) {
-	     document.getElementById('cs_search_title_td').style.display='inline';
-	  } else {
-	     document.getElementById('cs_search_title_td').style.display='none';
-	  }
-   }
-   
-   function openWin (url, name, param) {
-      var newwin = window.open(url, name, param);
-      newwin.focus();
-   }
-   
-   function buildFilterList() {
-      return "Custom Filter";
-   }
-   
-   function stripDelim(value,delim) {
-      value = value.replace(/delim/g,"");
-	  return value;
-   }
-
-	function unset(array, valueToUnset){
-		var output=new Array(0);
-		for(var i in array){
-			if(i==valueToUnset){continue;}
-			output[i]=array[i];
-		}
-		return output;
-	}
-</script>
-<div id="basicSearch">
-<tmpl_var advSearch.formHeader>
-<table width="100%" border="0" cellpadding="1" style="border-bottom:double gray 5px;border-top:solid gray 1px;margin-bottom:5px;margin-top:5px;">
-   <tbody id="filterbody">
-   <tr>
-      <td style="font-weight:bold;width:80px;">Search Events:</td>
-	  <td><input name="searchKeywords" /></td>
-   </tr>
-   
-   </tbody>
-</table>
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-	<td align="left" valign="top"><a href="javascript:void(addField())">Advanced Search</a></td>
-	<td align="right"><input type="submit" name="filter" id="filter_formId" value="Display Results" onclick="this.value='Please wait...'" /></td>
-</tr>
-</table>
-<!-- <tmpl_var search.formSubmit> -->
-<tmpl_var search.formFooter>
-</div>
-
-			
-		</div>
-	</td>
-</tr>
-<tr>
-	<td colspan="2">
-		<tmpl_var sortForm.header>
-		<div class="EMS_searchFilter">
-			<table width="100%">
-			<tbody>
-			<tr>
-				<td style="width:150px;text-align:left;"><i>Your search returned <tmpl_var numberOfSearchResults> results.</i></td>
-				<td>
-					<table>
-					<tbody>
-					<tr>
-						<td><tmpl_var sortForm.selectBox.label></td>
-						<td><tmpl_var sortForm.selectBox></td>
-						<td><tmpl_var sortForm.submit></td>
-					</tr>
-					</tbody>
-					</table>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2" align="center">
-					<div style="align: center;">
-						<tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount>
-					</div>
-				</td>
-			</tr>
-			</tbody>
-			</table>
-		</div>
-		<tmpl_var sortForm.footer>
-		
-		<div class="eventList">
-			<h2>Available Events</h2>
-		
-			<!-- EVENT -->			
-				<table cellpadding="2" cellspacing="0" border="0" class="event">
-				<tbody>
-				<tr>
-					<th>Event<br />Number</th>
-					<th>Event<br />Name</th>
-					<th>Start<br />Date</th>
-					<th>End<br />Date</th>
-					<th>Seats Left/<br />Available</th>
-					<th>Price</th>
-					<th>Add to Badge</th>
-				</tr>
-				<tmpl_loop events_loop>
-				<tr>
-					<td style="width:9%;white-space:nowrap" class="left">
-						<tmpl_if canManageEvents><tmpl_var manageToolbar>
-						<tmpl_unless eventIsApproved><span style="color:red;font-size:9pt;font-weight:bold;">&bull; Not Approved</span><tmpl_else><span style="color:green;font-size:9pt;font-weight:bold;">&bull; Approved</span></tmpl_unless></tmpl_if>
-					</td>
-					<td style="width:25%;"><tmpl_var title></td>
-					<td style="width:14%;">^D("%W %Z",<tmpl_var startDate>);</td>
-					<td style="width:14%;">^D("%W %Z",<tmpl_var endDate>);</td>
-					<td style="width:14%;"><tmpl_var seatsRemaining>/<tmpl_var maximumAttendees></td>
-					<td style="width:10%;"><tmpl_var price></td>
-					<td style="width:14%;" class="right">
-						<tmpl_unless eventIsFull>
-							<a href="<tmpl_var purchase.url>"><tmpl_var purchase.label></a>
-						<tmpl_else>
-							<tmpl_var purchase.label>
-						</tmpl_unless>
-					</td>
-				</tr>
-				</tmpl_loop>
-				</tbody>
-				</table>			
-			<!-- END EVENT -->
-		</div>	
-		<div class="EMS_searchFilter" style="height:23px;">
-			<table width="100%">
-			<tbody>
-			<tr>
-				<td align="center">
-					<div style="align: center;">
-						<tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount>
-					</div>
-				</td>
-			</tr>
-			</tbody>
-			</table>
-		</div>
-		<br />
-	</div>
-	</td>
-</tr>
-</table>
-
-<tmpl_else>
-<ul>
-<tmpl_if canManageEvents>
-   <li><a href="<tmpl_var addEvent.url>"><tmpl_var addEvent.label></a></li>
-   <li><a href="<tmpl_var manageRegistrants>">Manage Registrants</a> (Event Directors and Staff)</li>
-   <li><a href="<tmpl_var manageEvents.url>">Manage Events</a> (Event Directors and Staff)</li></tmpl_if>
-<tmpl_unless badgeSelected>
-   <li><a href="^PageUrl;">Return To Badge List to begin a badge purchase</a></li></tmpl_unless>
-</ul>
-
-<tmpl_if badgeSelected>
-<div><a href="<tmpl_var resetScratchCartUrl>">Click Here to add events to a badge you've already purchased, or to select a different badge. (Start Over)</a></div><br /><br />
-<div><span class="StepLabel">Step 2: </span><h2> Add Events to your Badge</h2></div>
-<tmpl_else>
-<div><span class="StepLabel">Browse Events: </span> You have not selected a Badge.  You cannot add events to your cart until you select a badge.</div>
-</tmpl_if>
-<tmpl_var calendarJS>
-<tmpl_unless noSearchDialog>
-<script type="text/javascript" src="<tmpl_var ems.wobject.dir>/script/dynamicForms.js"></script>
-
-<script type="text/javascript">
-function popUp(URL) {
-day = new Date();
-id = day.getTime();
-eval("page" + id + " = window.open(URL, '" + id + "', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=500')");
-}
-
-   <tmpl_var search.filters.options>
-   var advanced = 0;
-   var filterCount = 0;
-
-	function setSelectValue(selObj,newValue) {
-		for (var i=0; i<selObj.options.length; i++) {
-			selObj.options[i].selected = (selObj.options[i].value==newValue)?true:false;
-		}
-	}
-	
-
-   function toggleTitle(obj) {
-      if (obj.checked) {
-	     document.getElementById('cs_search_title_td').style.display='inline';
-	  } else {
-	     document.getElementById('cs_search_title_td').style.display='none';
-	  }
-   }
-   
-   function openWin (url, name, param) {
-      var newwin = window.open(url, name, param);
-      newwin.focus();
-   }
-   
-   function buildFilterList() {
-      return "Custom Filter";
-   }
-   
-   function stripDelim(value,delim) {
-      value = value.replace(/delim/g,"");
-	  return value;
-   }
-
-	function unset(array, valueToUnset){
-		var output=new Array(0);
-		for(var i in array){
-			if(i==valueToUnset){continue;}
-			output[i]=array[i];
-		}
-		return output;
-	}
-</script>
-
-<div id="basicSearch">
-<tmpl_var advSearch.formHeader>
-<h2>How to Use the Events Search</h2>
-<p><span style="font-style: italic; font-weight: bold">Basic Search</span> - This is the events search screen. There is a basic search box which allows you to search by event number, event title, and event description.
-
-<p><span style="font-style: italic; font-weight: bold">Advanced Search</span> - Click on <span style="color: blue">Advanced Search</span> and you will see a pull-down list appear in the search area. Select which event characteristic you would like to search by and then in the next drop-down box specify what type of search to do (equals, contains, is not, not like, starts with, ends with). Most searches will likely be "<span style="font-style: italic;">contains</span>."
-
-<table width="100%" border="0" cellpadding="1" style="border-bottom:double gray 5px;border-top:solid gray 1px;margin-bottom:5px;margin-top:5px;">
-   <tbody id="filterbody">
-   <tr>
-      <td style="font-weight:bold;width:80px">Search Events:</td>
-	  <td><input name="searchKeywords" /></td>
-   </tr>
-   
-   </tbody>
-</table>
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-	<td align="left" valign="top"><a href="javascript:void(addField())">Search By...</a></td>
-	<td align="right"><input type="submit" name="filter" id="filter_formId" value="Display Search Results" onclick="this.value='Please wait...'" /></td>
-</tr>
-</table>
-<!-- <tmpl_var search.formSubmit> -->
-<tmpl_var search.formFooter>
-</div>
-</tmpl_unless><!-- noSearchDialog -->
-<br /><br />
-<tmpl_if badgeSelected>
-<tmpl_if continue.url><table><tr><td align="right"><span class="StepLabel">Go to Step 3:</span><a href="<tmpl_var continue.url>">Add Badge and Events to Cart</a></td></tr><tr><td align="right"><span class="StepLabel">Go to Step 3:</span><a href="<tmpl_var checkoutNow.url>">Add Badge and Events to Cart and Checkout</a></td></tr></table></tmpl_if>
-</tmpl_if>
-
-<p><tmpl_var message></p>
-<tmpl_if badgeSelected>
-<p>Of the events you may add to this badge, your search returned <tmpl_var numberOfSearchResults> results.</p>
-<tmpl_else>
-<p>Your search returned <tmpl_var numberOfSearchResults> results.</p>
-</tmpl_if>
-
-<p><tmpl_var addToBadgeMessage></p>
-<div style="text-align: center;"><tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount></div><br />
-
-<!-- Sort Form -->
-<div style="align: right;">
-<tmpl_var sortForm.header>
-<tmpl_var sortForm.selectBox.label>&nbsp;
-<tmpl_var sortForm.selectBox>
-<tmpl_var sortForm.submit>
-<tmpl_var sortForm.footer>
-</div>
-
-<table width="100%" border="0" cellpadding="8" cellspacing="0" style="border-top:solid gray 2px;border-bottom:solid gray 2px;">
-<tr>
-<th>Event #</th>
-<th><tmpl_var name.label></th>
-<th><tmpl_var starts.label></th>
-<th><tmpl_var ends.label></th>
-<th>Seats<br />(Available/Max)</th>
-<th><tmpl_var price.label></th>
-<tmpl_if badgeSelected>
-<th>Add to Cart</th></tmpl_if>
-</tr>
-<tmpl_loop events_loop>
-  <tr<tmpl_unless __ODD__> class="oddRow"<tmpl_else> class="evenRow"</tmpl_unless>>
-
-  <td style="white-space:nowrap;">
-    <tmpl_if canManageEvents><tmpl_var manageToolbar>
-        <tmpl_unless eventIsApproved><span style="color:red;font-size:9pt;font-weight:bold;">&bull; <tmpl_var eventState.label></span><tmpl_else><span style="color:green;font-size:9pt;font-weight:bold;">&bull; <tmpl_var eventState.label></span></tmpl_unless></tmpl_if>
-  </td><td><tmpl_var title>
-  </td><td>^D("%W %Z",<tmpl_var startDate>);
-  </td><td>^D("%W %Z",<tmpl_var endDate>);
-  </td><td style="text-align: center;"><tmpl_var seatsRemaining>/<tmpl_var maximumAttendees>
-  </td><td><tmpl_var price>
-  </td><tmpl_if badgeSelected>
-    <td style="text-align: center;">
-      <tmpl_if canManageEvents>
-		<tmpl_unless eventIsFull>
-			<a href="<tmpl_var purchase.url>"><tmpl_var purchase.label></a>
-		<tmpl_else>
-			<tmpl_var purchase.label>
-		</tmpl_unless>
-      </tmpl_if>
-  </td>
-    </tmpl_if></tr>
-</tmpl_loop>
-
-</table>
-
-<div style="text-align: center;"><tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount></div>
-
-
-
-</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.5/Folder.tmpl b/docs/upgrades/templates-6.99.5/Folder.tmpl
deleted file mode 100644
index f1fe1c93f..000000000
--- a/docs/upgrades/templates-6.99.5/Folder.tmpl
+++ /dev/null
@@ -1,45 +0,0 @@
-#PBtmpl0000000000000078
-<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> </tmpl_if>
-			
-<tmpl_if session.var.adminOn> <p><a href="<tmpl_var addFile.url>"><tmpl_var addFile.label></a></p> </tmpl_if>
-				
-<table width="100%" cellpadding="3" cellspacing="0" class="content"> 
-<tmpl_loop subfolder_loop> 
-
- <tr>
- <td class="tableData" valign="top">
-<tmpl_if canView>
-	<a href="<tmpl_var url>"><img src="<tmpl_var icon.small>" border="0" alt="<tmpl_var title>" /></a>
-	<a href="<tmpl_var url>"><tmpl_var title></a>
-</tmpl_if>
- </td>
- <td class="tableData" valign="top" colspan="3">
- <tmpl_var synopsis>
- </td>
- </tr>
-</tmpl_loop>
-				    								
-<tmpl_loop file_loop>
- <tr>
- <td valign="top" class="tableData">
- <tmpl_if session.var.adminOn>
-  <tmpl_if canEdit>
-   <tmpl_var controls>
-  </tmpl_if>
- </tmpl_if>
-<tmpl_if canView>
- <a href="<tmpl_if isFile><tmpl_var file.url><tmpl_else><tmpl_var url></tmpl_if>"><img src="<tmpl_var icon.small>" border="0" alt="<tmpl_var title>" /></a>
- <a href="<tmpl_if isFile><tmpl_var file.url><tmpl_else><tmpl_var url></tmpl_if>"><tmpl_var title></a>
-</tmpl_if>
-</td> <td class="tableData" valign="top">
- <tmpl_var synopsis></td><td class="tableData" valign="top">^D("%z %Z",<tmpl_var date.epoch>);</td>
- <td class="tableData" valign="top"><tmpl_var size></td></tr>
-</tmpl_loop>
-</table>
-
diff --git a/docs/upgrades/templates-6.99.5/adminconsole.tmpl b/docs/upgrades/templates-6.99.5/adminconsole.tmpl
deleted file mode 100644
index a3b900167..000000000
--- a/docs/upgrades/templates-6.99.5/adminconsole.tmpl
+++ /dev/null
@@ -1,79 +0,0 @@
-#PBtmpl0000000000000001
-
-<div id="application_title">
-	<tmpl_var application.title>
-</div>
-<div id="application_workarea">
-	<tmpl_var application.workArea>
-</div>
-<div id="console_workarea">
-	<div class="adminConsoleSpacer">
-		&#160;
-	</div>
-	<tmpl_loop application_loop>
-		<tmpl_if canUse>
-			<div class="adminConsoleApplication">
-				<a href="<tmpl_var url>"><img src="<tmpl_var icon>" style="border-style:none;" title="<tmpl_var title>" alt="<tmpl_var title>" /></a><br />
-				<a href="<tmpl_var url>"><tmpl_var title></a>
-			</div>
-		</tmpl_if>
-	</tmpl_loop>
-	<div class="adminConsoleSpacer">
-		&#160;
-	</div>
-</div>
-<div class="adminConsoleMenu">
-	<div id="adminConsoleMainMenu" class="adminConsoleMainMenu">
-		<div id="console_toggle_on">
-			<a href="#" onclick="toggleAdminConsole()"><tmpl_var toggle.on.label></a><br />
-		</div>
-		<div id="console_toggle_off">
-			<a href="#" onclick="toggleAdminConsole()"><tmpl_var toggle.off.label></a><br />
-		</div>
-	</div>
-	<tmpl_if submenu_loop>
-	<div id="adminConsoleApplicationSubmenu" class="adminConsoleApplicationSubmenu">
-		<tmpl_loop submenu_loop>
-			<a href="<tmpl_var url>" <tmpl_var extras>><tmpl_var label></a><br />
-		</tmpl_loop>
-	</div>
-	</tmpl_if>
-	<tmpl_if versionTags>
-	<div id="adminConsoleVersionTags" class="adminConsoleVersionTags">
-		<tmpl_loop versionTags>
-			<a href="<tmpl_var url>"><tmpl_var title></a><br />
-		</tmpl_loop>
-	</div>
-	</tmpl_if>
-	<div id="adminConsoleUtilityMenu" class="adminConsoleUtilityMenu">
-		<a href="<tmpl_var backtosite.url>"><tmpl_var backtosite.label></a><br />
-		^AdminToggle;<br />
-		^LoginToggle;<br />
-	</div>
-</div>
-<div id="console_title">
-	<tmpl_var console.title>
-</div>
-<div id="application_help">
-	<tmpl_if help.url>
-		<a href="<tmpl_var help.url>"><img src="^Extras(adminConsole/small/help.gif);" alt="?" style="border-style:none;" /></a>
-	</tmpl_if>
-</div>
-<div id="application_icon">
-	<img src="<tmpl_var application.icon>" style="border-style:none;" title="<tmpl_var application.title>" alt="<tmpl_var application.title>" />
-</div>
-<div class="adminConsoleTitleIconMedalian">
-<img src="^Extras(adminConsole/medalian.gif);" style="border-style:none;" alt="*" />
-</div>
-<div id="console_icon">
-	<img src="<tmpl_var console.icon>" style="border-style:none;" title="<tmpl_var console.title>" alt="<tmpl_var console.title>" />
-</div>
-<script type="text/javascript" defer="defer">
-	initAdminConsole(<tmpl_if application.title>true<tmpl_else>false</tmpl_if>,<tmpl_if submenu_loop>true<tmpl_else>false</tmpl_if>);
-</script>
-
-~~~
-<link href="^Extras(adminConsole/adminConsole.css);" type="text/css" rel="stylesheet" />
-<script src="^Extras(adminConsole/adminConsole.js);" type="text/javascript"></script>
-
-
diff --git a/docs/upgrades/templates-6.99.5/request_tracker_post_form.tmpl b/docs/upgrades/templates-6.99.5/request_tracker_post_form.tmpl
deleted file mode 100644
index 3dd8f6869..000000000
--- a/docs/upgrades/templates-6.99.5/request_tracker_post_form.tmpl
+++ /dev/null
@@ -1,115 +0,0 @@
-#PBtmpl0000000000000210
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if preview.title>
-	<p><b><tmpl_var preview.title></b></p>
-</tmpl_if>
-
-<tmpl_if preview.content>
-	<p><tmpl_var preview.content></p>
-</tmpl_if>
-
-<h2><tmpl_var message.header.label></h2>
-
-<tmpl_var form.header>
-<table class="defaultPostForm">
-	<tmpl_if isNewPost>
-		<tmpl_if user.isVisitor>
-			<tr>
-				<td><tmpl_var visitorName.label></td>
-				<td><tmpl_var visitorName.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td><tmpl_var subject.label></td>
-		<td><tmpl_var title.form></td>
-	</tr>
-	<tr>
-		<td><tmpl_var severity.label></td>
-		<td><select id="myCustomField1" name="userDefined1">
-<option value="<tmpl_var cosmetic.label>"><tmpl_var cosmetic.label></option>
-<option value="<tmpl_var minor.label>"><tmpl_var minor.label></option>
-<option value="<tmpl_var critical.label>"><tmpl_var critical.label></option>
-<option value="<tmpl_var fatal.label>"><tmpl_var fatal.label></option>
-</select>
-<script type="text/javascript">
-  var value = '<tmpl_var name="userDefined1" escape="JS">';
-  var field = document.getElementById("myCustomField1");
-  for (var i = 0; i < field.options.length; i++) {
-    if (field.options[i].value == value)  {
-       field.selectedIndex = i;
-    }  
-  }
-</script>
-</td>
-	</tr>
-	<tr>
-		<td><tmpl_var description.label></td>
-		<td><tmpl_var content.form></td>
-	</tr>
-	<tmpl_if attachment.form>
-		<tr>
-			<td><tmpl_var attachment.label></td>
-			<td><tmpl_var attachment.form></td>
-		</tr>
-	</tmpl_if>
-<tmpl_if user.isModerator>
-	<tmpl_if karmaIsEnabled><tmpl_if isThread>
-				<tr>
-					<td><tmpl_var karmaScale.label></td>
-					<td><tmpl_var karmaScale.form></td>
-				</tr>
-	</tmpl_if></tmpl_if>
-	<tmpl_unless isThread>
-		<tr>
-			<td><tmpl_var close.label></td>
-			<td><tmpl_var archive.form></td>
-		</tr>
-	</tmpl_unless>
-</tmpl_if>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<p><b><tmpl_var reply.title></b></p>
-	<tmpl_var reply.content>
-</tmpl_if>
-~~~
-<style type="text/css">
-table.defaultPostForm td
-{
-	font-family:arial;
-	font-size:9pt;
-}
-h2
-{
-	font-family:arial;
-}
-</style>
-
-
diff --git a/docs/upgrades/templates-6.99.5/wgtemplate_default_tt_row.tmpl b/docs/upgrades/templates-6.99.5/wgtemplate_default_tt_row.tmpl
deleted file mode 100644
index 887bdea60..000000000
--- a/docs/upgrades/templates-6.99.5/wgtemplate_default_tt_row.tmpl
+++ /dev/null
@@ -1,68 +0,0 @@
-#TimeTrackingTMPL000003
-<table class="timeTracking02" cellpadding="3" cellspacing="0">
-<tbody id="ttbody">
-   <tr class="tt_title" id="tt_title">
-      <td colspan="4" align="left"><tmpl_var time.report.header></td>
-	  <td colspan="2" align="right"><tmpl_var time.report.totalHours.label> <strong style="color:red;" id="totalHours"><tmpl_var time.totalHours></strong></td>
-   </tr>
-   <tr class="tt_header" id="tt_header">
-      <td width="10%"><tmpl_var time.report.date.label></td>
-	  <td width="20%"><tmpl_var time.report.project.label></td>
-	  <td width="20%"><tmpl_var time.report.task.label></td>
-	  <td width="10%"><tmpl_var time.report.hours.label></td>
-	  <td width="40%"><tmpl_var time.report.comments.label></td>
-	  <td>&#160;</td>
-   </tr>
-   <tmpl_loop time.entry.loop>
-      <tr id="<tmpl_var row.id>">
-         <td class="cell"><tmpl_var form.taskEntryId><tmpl_var form.date></td>
-         <td class="cell"><tmpl_var form.project></td>
-         <td class="cell"><tmpl_var form.task></td>
-         <td class="cell"><tmpl_var form.hours></td>
-         <td class="cell"><tmpl_var form.comments></td>
-         <td><img src="<tmpl_var extras>/delete.gif" border="0" onclick="removeRow('<tmpl_var row.id>')" style="cursor:pointer"/></td>
-      </tr>
-   </tmpl_loop>
-   <tr class="tt_empty" id="tt_empty">
-      <td colspan="6" style="border-top:solid gray 2px;">
-	     <table width="100%" cellpadding="2" cellspacing="0">
-			<tr>
-				<td align="left"><a href="<tmpl_var report.lastWeek.url>" class="PM_blueLink"><b>&lsaquo;</b> Last Week</a></td>
-				<td align="right"><a href="<tmpl_var report.nextWeek.url>" class="PM_blueLink">Next Week <b>&rsaquo;</b></a></td>
-			</tr>
-			<tr>
-				<td colspan="2" style="border-bottom:solid #F0F0F0 1px;">&nbsp;</td>
-			</tr>
-			<tr>
-				<td style="width:60%;" align="left">
-					<tmpl_var time.report.complete.label><tmpl_var form.isComplete>
-				</td>
-				<td style="width:40%" align="right">
-					<input type="button" value="<tmpl_var time.add.row.label>" onclick="addRow();" /> &#160; <input type="submit" value="<tmpl_var time.save.label>" />
-				</td>			
-			</tr>
-	      </table>		
-	   </td>
-	</tr>
- </tbody>
-</table>
-
-<tmpl_unless report.isComplete>
-<table style="display:none" id="tt_table">
-   <tbody>
-      <tr id="<tmpl_var row.id>">
-         <td class="cell"><tmpl_var form.taskEntryId><tmpl_var form.date></td>
-         <td class="cell"><tmpl_var form.project></td>
-         <td class="cell"><tmpl_var form.task></td>
-         <td class="cell"><tmpl_var form.hours></td>
-         <td class="cell"><tmpl_var form.comments></td>
-         <td><img src="<tmpl_var extras>/delete.gif" border="0" onclick="removeRow()" style="cursor:pointer" /></td>
-      </tr>
-   </tbody>
-</table>
-</tmpl_unless>
-
-
-
-~~~
-	
diff --git a/docs/upgrades/templates-7.0.1/request_tracker_post_form.tmpl b/docs/upgrades/templates-7.0.1/request_tracker_post_form.tmpl
deleted file mode 100644
index 964bde924..000000000
--- a/docs/upgrades/templates-7.0.1/request_tracker_post_form.tmpl
+++ /dev/null
@@ -1,117 +0,0 @@
-#PBtmpl0000000000000210
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if preview.title>
-	<p><b><tmpl_var preview.title></b></p>
-</tmpl_if>
-
-<tmpl_if preview.content>
-	<p><tmpl_var preview.content></p>
-</tmpl_if>
-
-<h2><tmpl_var message.header.label></h2>
-
-<tmpl_var form.header>
-<table class="defaultPostForm">
-	<tmpl_if isNewPost>
-		<tmpl_if user.isVisitor>
-			<tr>
-				<td><tmpl_var visitorName.label></td>
-				<td><tmpl_var visitorName.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td><tmpl_var subject.label></td>
-		<td><tmpl_var title.form></td>
-	</tr>
-	<tmpl_if isThread>
-	<tr>
-		<td><tmpl_var severity.label></td>
-		<td><select id="myCustomField1" name="userDefined1">
-<option value="<tmpl_var cosmetic.label>"><tmpl_var cosmetic.label></option>
-<option value="<tmpl_var minor.label>"><tmpl_var minor.label></option>
-<option value="<tmpl_var critical.label>"><tmpl_var critical.label></option>
-<option value="<tmpl_var fatal.label>"><tmpl_var fatal.label></option>
-</select>
-<script type="text/javascript">
-  var value = '<tmpl_var name="userDefined1" escape="JS">';
-  var field = document.getElementById("myCustomField1");
-  for (var i = 0; i < field.options.length; i++) {
-    if (field.options[i].value == value)  {
-       field.selectedIndex = i;
-    }  
-  }
-</script>
-</td>
-	</tr>
-	</tmpl_if>
-	<tr>
-		<td><tmpl_var description.label></td>
-		<td><tmpl_var content.form></td>
-	</tr>
-	<tmpl_if attachment.form>
-		<tr>
-			<td><tmpl_var attachment.label></td>
-			<td><tmpl_var attachment.form></td>
-		</tr>
-	</tmpl_if>
-<tmpl_if user.isModerator>
-	<tmpl_if karmaIsEnabled><tmpl_if isThread>
-				<tr>
-					<td><tmpl_var karmaScale.label></td>
-					<td><tmpl_var karmaScale.form></td>
-				</tr>
-	</tmpl_if></tmpl_if>
-	<tmpl_unless isThread>
-		<tr>
-			<td><tmpl_var close.label></td>
-			<td><tmpl_var archive.form></td>
-		</tr>
-	</tmpl_unless>
-</tmpl_if>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<p><b><tmpl_var reply.title></b></p>
-	<tmpl_var reply.content>
-</tmpl_if>
-~~~
-<style type="text/css">
-table.defaultPostForm td
-{
-	font-family:arial;
-	font-size:9pt;
-}
-h2
-{
-	font-family:arial;
-}
-</style>
-
-
diff --git a/docs/upgrades/templates-7.0.3/commerce_checkout_confirmation.tmpl b/docs/upgrades/templates-7.0.3/commerce_checkout_confirmation.tmpl
deleted file mode 100644
index 865c32b34..000000000
--- a/docs/upgrades/templates-7.0.3/commerce_checkout_confirmation.tmpl
+++ /dev/null
@@ -1,65 +0,0 @@
-#PBtmpl0000000000000016
-<a href="<tmpl_var viewShoppingCart.url>"><tmpl_var viewShoppingCart.label></a> &middot;
-<a href="<tmpl_var changePayment.url>"><tmpl_var changePayment.label></a> &middot; 
-<a href="<tmpl_var changeShipping.url>"><tmpl_var changeShipping.label></a><br />
-<br />
-
-<tmpl_var title><br />
-<ul>
-<tmpl_loop errorLoop>
-<li><tmpl_var message></li>
-</tmpl_loop>
-</ul>
-
-<table> <tr align="left">
-      <th style="border-bottom: 2px solid black">Product</th>
-      <th style="border-bottom: 2px solid black">Quantity</th>
-      <th style="border-bottom: 2px solid black" align='center'>Price</th>
-      <th style="border-bottom: 2px solid black">Amount</th>
-      <th style="border-bottom: 2px solid black">Each</th>
-  </tr>
-
-  <tmpl_if normalItems>
-  </tmpl_if>
-
-  <tmpl_loop normalItemsLoop>
-  <tr>
-      <td align="left"><tmpl_var name></td>
-      <td align="center"><tmpl_var quantity></td>
-      <td align="right"><tmpl_var price></td>
-      <td align="right"><tmpl_var totalPrice></td>
-      <td>&nbsp;</td>
-  </tr>
-  </tmpl_loop>
-
-  <tmpl_loop recurringItemsLoop>
-  <tr>
-      <td align="left"><tmpl_var name></td>
-      <td align="center"><tmpl_var quantity></td>
-      <td align="left"><tmpl_var price></td>
-      <td align="right"><tmpl_var totalPrice></td>
-      <td align="left"><tmpl_var period></td>
-  </tr>
-</tmpl_loop>
-  <tr style="border-top: 1px solid black">
-      <td colspan='2' style="border-top: 1px solid black">&nbsp;</td>
-      <td align="right" style="border-top: 1px solid black"><b>Subtotal</b></td>
-      <td align="right" style="border-top: 1px solid black"><b><tmpl_var subtotal></b></td>
-  </tr>
-  <tr>
-      <td colspan="3" align="right">Shipping</td>
-      <td align="right"><tmpl_var shippingCost></td>
-  </tr>
-  <tr>
-      <td colspan="3" align="right"><tmpl_var discountsApplied.label></td>
-      <td align="right"><tmpl_var discountsApplied></td>
-  </tr>
-  <tr>
-      <td colspan="3" align="right" style="border-top: 1px solid black"><b>Total</b></td>
-      <td align="right" style="border-top: 1px solid black"><b><tmpl_var total></b></td>
-
-</table>
-
-<br /><br />
-
-<tmpl_var form>
diff --git a/docs/upgrades/templates-7.0.3/default_ems_search_template.tmpl b/docs/upgrades/templates-7.0.3/default_ems_search_template.tmpl
deleted file mode 100644
index 04b840943..000000000
--- a/docs/upgrades/templates-7.0.3/default_ems_search_template.tmpl
+++ /dev/null
@@ -1,904 +0,0 @@
-#EventManagerTmpl000006
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if session.var.adminOn>
-        <p><tmpl_var controls></p><br /><br />
-</tmpl_if>
-
-<tmpl_if badgeSelected>
-<table border="0" cellpadding="5" cellspacing="0" width="100%">
-<tr>
-	<td style="width:50%;" valign="top">
-		<div class="badge">
-			<tmpl_loop badgeHolderInfo_loop>
-			<h2><tmpl_var mainEventTitle><br /><tmpl_var firstName> <tmpl_var lastName></h2>
-
-			<!-- USER DATA -->
-			<div class="badgeContent" style="background-color:#E5E5E5;">
-				<table cellpadding="1" cellspacing="3" width="100%" class="userData">
-				<tbody>
-				<tr>
-					<td style="width:65px;">&nbsp;Address</td>
-					<td class="data">&nbsp;<tmpl_var address></td>
-				</tr>
-				<tr>
-					<td>&nbsp;City</td>
-					<td class="data">&nbsp;<tmpl_var city></td>
-				</tr>
-				<tr>
-					<td>&nbsp;State</td>
-					<td class="data">&nbsp;<tmpl_var state></td>
-				</tr>
-				<tr>
-					<td>&nbsp;ZIP</td>
-					<td class="data">&nbsp;<tmpl_var zipCode></td>
-				</tr>
-				<tr>
-					<td>&nbsp;Phone</td>
-					<td class="data">&nbsp;<tmpl_var phone></td>
-				</tr>
-				<tr>
-					<td>&nbsp;Country</td>				
-					<td class="data">&nbsp;<tmpl_var country></td>
-				</tr>			
-				</tbody>
-				</table>
-			</tmpl_loop>
-			</div>
-			<!-- END USER DATA -->
-			
-			<!-- BADGE EVENT -->
-			<tmpl_loop eventsInBadge_loop>
-			<div class="badgeContent">
-				<table cellpadding="0" cellspacing="0" width="100%">
-				<tbody>
-				
-				<tr>
-					<td style="width:43%;text-align:left;"><tmpl_var title></td>
-					<td style="width:40%;text-align:right;">^D("%W %Z",<tmpl_var startDate>);</td>
-					<td style="width:17%;text-align:right;"><tmpl_if removeEventFromBadge.url><a href="<tmpl_var removeEventFromBadge.url>">Remove</a></tmpl_if></td>
-				</tr>
-				
-				</tbody>
-				</table>
-			</div>
-			</tmpl_loop>
-			<!-- END BADGE EVENT -->
-			
-
-			<!-- BADGE FOOTER -->
-			<div class="badgeFooter">
-				<table cellpadding="0" cellspacing="0" width="100%">
-				<tbody>
-				<tr>
-					<td style="width:50%;"><a href="<tmpl_var resetScratchCartUrl>" style="float:left;">Start Over</a></td>
-					<td style="width:50%;"><a href="<tmpl_var continue.url>" style="float:right;">Add Contents to Cart</a></td>					
-				</tr>
-				</tbody>
-				</table>	
-			</div>
-			<!-- END BADGE FOOTER -->
-		</div>
-	</td>
-	<td style="width:50%;" valign="top">			
-			<tmpl_if cart.purchaseLoop>
-			<div class="cart">
-				<h2>Shopping Cart</h2>
-				<tmpl_loop cart.purchaseLoop>
-				<div class="cartContent">
-					<tmpl_var deleteIcon><tmpl_var editIcon> <tmpl_var purchase.mainEventTitle> <br />
-					<tmpl_loop registrantInfoLoop>
-					Name: <tmpl_var firstName> <tmpl_var lastName>
-					</tmpl_loop>
-					<br />Additional Price: $<tmpl_var newPrice> 
-				</div>
-				</tmpl_loop>
-				<!-- OEOS -->
-				<div style="text-align:right;margin:0px;">
-					<a href="<tmpl_var emptyCart.url>">Empty Cart</a> &bull; <a href="<tmpl_var checkout.url>">Checkout</a>
-				</div>
-			</div>
-			</tmpl_if>
-			<br />
-			<div class="eventSearch">
-					<h2>Search Instructions</h2>
-			
-					<span style="font-style: italic; font-weight: bold">Basic Search</span> - This is the events search screen. There is a basic search box which allows you to search by event number, event title, and event description.<br /><br />
-
-					<span style="font-style: italic; font-weight: bold">Advanced Search</span> - Click on <span style="color: blue">Advanced Search</span> and you will see a pull-down list appear in the search area. Select which event characteristic you would like to search by and then in the next drop-down box specify what type of search to do (equals, contains, is not, not like, starts with, ends with). Most searches will likely be "<span style="font-style: italic;">contains</span>."
-		</div>
-		<br />
-
-	</td>
-</tr>
-<tr>
-	<td colspan="2">
-		<div class="eventSearch">
-			<h2>Search</h2>
-			
-<script type="text/javascript" src="<tmpl_var ems.wobject.dir>/script/dynamicForms.js"></script>
-
-<script type="text/javascript">
-//<![CDATA[
-function popUp(URL) {
-day = new Date();
-id = day.getTime();
-eval("page" + id + " = window.open(URL, '" + id + "', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=500')");
-}
-
-   <tmpl_var search.filters.options>
-   var advanced = 0;
-   var filterCount = 0;
-
-	function setSelectValue(selObj,newValue) {
-		for (var i=0; i<selObj.options.length; i++) {
-			selObj.options[i].selected = (selObj.options[i].value==newValue)?true:false;
-		}
-	}
-	
-
-   function toggleTitle(obj) {
-      if (obj.checked) {
-	     document.getElementById('cs_search_title_td').style.display='inline';
-	  } else {
-	     document.getElementById('cs_search_title_td').style.display='none';
-	  }
-   }
-   
-   function openWin (url, name, param) {
-      var newwin = window.open(url, name, param);
-      newwin.focus();
-   }
-   
-   function buildFilterList() {
-      return "Custom Filter";
-   }
-   
-   function stripDelim(value,delim) {
-      value = value.replace(/delim/g,"");
-	  return value;
-   }
-
-	function unset(array, valueToUnset){
-		var output=new Array(0);
-		for(var i in array){
-			if(i==valueToUnset){continue;}
-			output[i]=array[i];
-		}
-		return output;
-	}
-//]]>
-</script>
-<div id="basicSearch">
-<tmpl_var advSearch.formHeader>
-<table width="100%" border="0" cellpadding="1" style="border-bottom:double gray 5px;border-top:solid gray 1px;margin-bottom:5px;margin-top:5px;">
-   <tbody id="filterbody">
-   <tr>
-      <td style="font-weight:bold;width:80px;">Search Events:</td>
-	  <td><input name="searchKeywords" /></td>
-   </tr>
-   
-   </tbody>
-</table>
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-	<td align="left" valign="top"><a href="javascript:void(addField())">Advanced Search</a></td>
-	<td align="right"><input type="submit" name="filter" id="filter_formId" value="Display Results" onclick="this.value='Please wait...'" /></td>
-</tr>
-</table>
-<!-- <tmpl_var search.formSubmit> -->
-<tmpl_var search.formFooter>
-</div>
-
-			
-		</div>
-	</td>
-</tr>
-<tr>
-	<td colspan="2">
-		<tmpl_var sortForm.header>
-		<div class="EMS_searchFilter">
-			<table width="100%">
-			<tbody>
-			<tr>
-				<td style="width:150px;text-align:left;"><i>Your search returned <tmpl_var numberOfSearchResults> results.</i></td>
-				<td>
-					<table>
-					<tbody>
-					<tr>
-						<td><tmpl_var sortForm.selectBox.label></td>
-						<td><tmpl_var sortForm.selectBox></td>
-						<td><tmpl_var sortForm.submit></td>
-					</tr>
-					</tbody>
-					</table>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2" align="center">
-					<div style="align: center;">
-						<tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount>
-					</div>
-				</td>
-			</tr>
-			</tbody>
-			</table>
-		</div>
-		<tmpl_var sortForm.footer>
-		
-		<div class="eventList">
-			<h2>Available Events</h2>
-		
-			<!-- EVENT -->			
-				<table cellpadding="2" cellspacing="0" border="0" class="event">
-				<tbody>
-				<tr>
-					<th>&nbsp;</th>
-					<th>Event<br />Name</th>
-					<th>Start<br />Date</th>
-					<th>End<br />Date</th>
-					<th>Seats Left/<br />Available</th>
-					<th>Price</th>
-					<th>Add to Badge</th>
-				</tr>
-				<tmpl_loop events_loop>
-				<tr>
-					<td style="width:9%;white-space:nowrap" class="left">
-						<tmpl_if canManageEvents><tmpl_var manageToolbar>
-						<tmpl_unless eventIsApproved><span style="color:red;font-size:9pt;font-weight:bold;">&bull; Not Approved</span><tmpl_else><span style="color:green;font-size:9pt;font-weight:bold;">&bull; Approved</span></tmpl_unless></tmpl_if>
-					</td>
-					<td style="width:25%;"><tmpl_var title></td>
-					<td style="width:14%;">^D("%W %Z",<tmpl_var startDate>);</td>
-					<td style="width:14%;">^D("%W %Z",<tmpl_var endDate>);</td>
-					<td style="width:14%;"><tmpl_var seatsRemaining>/<tmpl_var maximumAttendees></td>
-					<td style="width:10%;"><tmpl_var price></td>
-					<td style="width:14%;" class="right">
-						<tmpl_unless eventIsFull>
-							<a href="<tmpl_var purchase.url>"><tmpl_var purchase.label></a>
-						<tmpl_else>
-							<tmpl_var purchase.label>
-						</tmpl_unless>
-					</td>
-				</tr>
-				</tmpl_loop>
-				</tbody>
-				</table>			
-			<!-- END EVENT -->
-		</div>	
-		<div class="EMS_searchFilter" style="height:23px;">
-			<table width="100%">
-			<tbody>
-			<tr>
-				<td align="center">
-					<div style="align: center;">
-						<tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount>
-					</div>
-				</td>
-			</tr>
-			</tbody>
-			</table>
-		</div>
-		<br />
-	</div>
-	</td>
-</tr>
-</table>
-
-<tmpl_else>
-<ul>
-<tmpl_if canManageEvents>
-   <li><a href="<tmpl_var addEvent.url>"><tmpl_var addEvent.label></a></li>
-   <li><a href="<tmpl_var manageRegistrants>">Manage Registrants</a> (Event Directors and Staff)</li>
-   <li><a href="<tmpl_var manageEvents.url>">Manage Events</a> (Event Directors and Staff)</li></tmpl_if>
-<tmpl_unless badgeSelected>
-   <li><a href="^PageUrl;">Return To Badge List to begin a badge purchase</a></li></tmpl_unless>
-</ul>
-
-<tmpl_if badgeSelected>
-<div><a href="<tmpl_var resetScratchCartUrl>">Click Here to add events to a badge you've already purchased, or to select a different badge. (Start Over)</a></div><br /><br />
-<div><span class="StepLabel">Step 2: </span><h2> Add Events to your Badge</h2></div>
-<tmpl_else>
-<div><span class="StepLabel">Browse Events: </span> You have not selected a Badge.  You cannot add events to your cart until you select a badge.</div>
-</tmpl_if>
-<tmpl_var calendarJS>
-<tmpl_unless noSearchDialog>
-<script type="text/javascript" src="<tmpl_var ems.wobject.dir>/script/dynamicForms.js"></script>
-
-<script type="text/javascript">
-//<![CDATA[
-function popUp(URL) {
-day = new Date();
-id = day.getTime();
-eval("page" + id + " = window.open(URL, '" + id + "', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=500')");
-}
-
-   <tmpl_var search.filters.options>
-   var advanced = 0;
-   var filterCount = 0;
-
-	function setSelectValue(selObj,newValue) {
-		for (var i=0; i<selObj.options.length; i++) {
-			selObj.options[i].selected = (selObj.options[i].value==newValue)?true:false;
-		}
-	}
-	
-
-   function toggleTitle(obj) {
-      if (obj.checked) {
-	     document.getElementById('cs_search_title_td').style.display='inline';
-	  } else {
-	     document.getElementById('cs_search_title_td').style.display='none';
-	  }
-   }
-   
-   function openWin (url, name, param) {
-      var newwin = window.open(url, name, param);
-      newwin.focus();
-   }
-   
-   function buildFilterList() {
-      return "Custom Filter";
-   }
-   
-   function stripDelim(value,delim) {
-      value = value.replace(/delim/g,"");
-	  return value;
-   }
-
-	function unset(array, valueToUnset){
-		var output=new Array(0);
-		for(var i in array){
-			if(i==valueToUnset){continue;}
-			output[i]=array[i];
-		}
-		return output;
-	}
-//]]>
-</script>
-
-<div id="basicSearch">
-<tmpl_var advSearch.formHeader>
-<h2>How to Use the Events Search</h2>
-<p><span style="font-style: italic; font-weight: bold">Basic Search</span> - This is the events search screen. There is a basic search box which allows you to search by event number, event title, and event description.
-
-<p><span style="font-style: italic; font-weight: bold">Advanced Search</span> - Click on <span style="color: blue">Advanced Search</span> and you will see a pull-down list appear in the search area. Select which event characteristic you would like to search by and then in the next drop-down box specify what type of search to do (equals, contains, is not, not like, starts with, ends with). Most searches will likely be "<span style="font-style: italic;">contains</span>."
-
-<table width="100%" border="0" cellpadding="1" style="border-bottom:double gray 5px;border-top:solid gray 1px;margin-bottom:5px;margin-top:5px;">
-   <tbody id="filterbody">
-   <tr>
-      <td style="font-weight:bold;width:80px">Search Events:</td>
-	  <td><input name="searchKeywords" /></td>
-   </tr>
-   
-   </tbody>
-</table>
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-	<td align="left" valign="top"><a href="javascript:void(addField())">Search By...</a></td>
-	<td align="right"><input type="submit" name="filter" id="filter_formId" value="Display Search Results" onclick="this.value='Please wait...'" /></td>
-</tr>
-</table>
-<!-- <tmpl_var search.formSubmit> -->
-<tmpl_var search.formFooter>
-</div>
-</tmpl_unless><!-- noSearchDialog -->
-<br /><br />
-<tmpl_if badgeSelected>
-<tmpl_if continue.url><table><tr><td align="right"><span class="StepLabel">Go to Step 3:</span><a href="<tmpl_var continue.url>">Add Badge and Events to Cart</a></td></tr><tr><td align="right"><span class="StepLabel">Go to Step 3:</span><a href="<tmpl_var checkoutNow.url>">Add Badge and Events to Cart and Checkout</a></td></tr></table></tmpl_if>
-</tmpl_if>
-
-<p><tmpl_var message></p>
-<tmpl_if badgeSelected>
-<p>Of the events you may add to this badge, your search returned <tmpl_var numberOfSearchResults> results.</p>
-<tmpl_else>
-<p>Your search returned <tmpl_var numberOfSearchResults> results.</p>
-</tmpl_if>
-
-<p><tmpl_var addToBadgeMessage></p>
-<div style="text-align: center;"><tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount></div><br />
-
-<!-- Sort Form -->
-<div style="align: right;">
-<tmpl_var sortForm.header>
-<tmpl_var sortForm.selectBox.label>&nbsp;
-<tmpl_var sortForm.selectBox>
-<tmpl_var sortForm.submit>
-<tmpl_var sortForm.footer>
-</div>
-
-<table width="100%" border="0" cellpadding="8" cellspacing="0" style="border-top:solid gray 2px;border-bottom:solid gray 2px;">
-<tr>
-<th>&nbsp;</th>
-<th><tmpl_var name.label></th>
-<th><tmpl_var starts.label></th>
-<th><tmpl_var ends.label></th>
-<th>Seats<br />(Available/Max)</th>
-<th><tmpl_var price.label></th>
-<tmpl_if badgeSelected>
-<th>Add to Cart</th></tmpl_if>
-</tr>
-<tmpl_loop events_loop>
-  <tr<tmpl_unless __ODD__> class="oddRow"<tmpl_else> class="evenRow"</tmpl_unless>>
-
-  <td style="white-space:nowrap;">
-    <tmpl_if canManageEvents><tmpl_var manageToolbar>
-        <tmpl_unless eventIsApproved><span style="color:red;font-size:9pt;font-weight:bold;">&bull; <tmpl_var eventState.label></span><tmpl_else><span style="color:green;font-size:9pt;font-weight:bold;">&bull; <tmpl_var eventState.label></span></tmpl_unless></tmpl_if>
-  </td><td><tmpl_var title>
-  </td><td>^D("%W %Z",<tmpl_var startDate>);
-  </td><td>^D("%W %Z",<tmpl_var endDate>);
-  </td><td style="text-align: center;"><tmpl_var seatsRemaining>/<tmpl_var maximumAttendees>
-  </td><td><tmpl_var price>
-  </td><tmpl_if badgeSelected>
-    <td style="text-align: center;">
-      <tmpl_if canManageEvents>
-		<tmpl_unless eventIsFull>
-			<a href="<tmpl_var purchase.url>"><tmpl_var purchase.label></a>
-		<tmpl_else>
-			<tmpl_var purchase.label>
-		</tmpl_unless>
-      </tmpl_if>
-  </td>
-    </tmpl_if></tr>
-</tmpl_loop>
-
-</table>
-
-<div style="text-align: center;"><tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount></div>
-
-</tmpl_if>
-~~~
-<style type="text/css">
-
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-.manageEvents {
-	margin-top:5px;
-	margin-bottom:5px;
-}
-.datacardtitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:13px;
-}
-.leftnav {
-	padding: 1px 1px 1px 1px;
-	background: white;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.leftnavon {
-	padding: 1px 1px 1px 1px;
-	background: yellow;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.calendartitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-}
-.filter-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 105px;
-}
-.compare-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 76px;
-}
-.filter-text {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 114px;
-}
-.smLink {
-   font-family: verdana;
-   font-size: 10px;
-   font-weight: normal;
-   color: blue;
-}
-.StepLabel {
-	font-family: Tahoma;
-	font-size: 14pt;
-	letter-spacing: 2pt;
-	color: #234E9C;
-	font-weight: bold;
-}
-
-/* BADGE CSS */
-.badge {
-	width:92%;
-	background-color:#F0F0F0;
-	-moz-border-radius:15px;
-	padding:5px;
-	-moz-box-sizing:border-box;
-	font-family:verdana;
-	font-size:9pt;
-}
-.badge h2 {
-	width:100%;
-	font-size:12.5pt;
-	background-color:#E2E2E2;
-	text-align:center;
-	-moz-border-radius-topLeft:15px;
-	-moz-border-radius-topRight:15px;
-	margin:0px;
-	border:solid #E0E0E0 1px;
-	padding:5px;
-	-moz-box-sizing:border-box;
-	color:gray;
-}
-.badgeContent {
-	width:100%;
-	background-color:#F4F4F4;
-	margin:0px;
-	margin-top:5px;
-	margin-bottom:5px;
-	border:solid #E0E0E0 1px;
-	padding:5px;
-	-moz-box-sizing:border-box;
-	font-family:verdana;
-	font-size:9pt;
-}
-.badgeContent a {
-	background-color:#CF1D1D;
-	padding:5px;
-	color:white;
-	border:solid #9C1616 1px;
-	text-decoration:none;
-	font-weight:bold;
-	text-align:center;
-	-moz-border-radius:10px;
-	display:block;
-	width:40px;
-	font-size:7pt;
-	float:right;
-	margin-left:10px;
-	letter-spacing:0px;
-}
-.badgeContent a:hover {
-	background-color:#9C1616;
-	color:#CF1D1D;
-	color:white;
-}
-.badgeFooter {
-	width:100%;
-	background-color:#E2E2E2;
-	-moz-border-radius-bottomLeft:15px;
-	-moz-border-radius-bottomRight:15px;
-	margin:0px;
-	border:solid #E0E0E0 1px;
-	padding:5px;
-	-moz-box-sizing:border-box;
-	text-align:center;
-}
-.badgeFooter a {
-	background-color:#E2E2E2;
-	padding:5px;
-	color:gray;
-	border:solid #F4F4F4 1px;
-	text-decoration:none;
-	font-weight:bold;
-	text-align:center;
-	-moz-border-radius:10px;
-	display:block;
-}
-.badgeFooter a:hover {
-	background-color:#F0F0F0;
-	color:gray;
-}
-.userData td {
-	background-color:#E2E2E2;
-	font-size:7pt;
-	-moz-border-radius:15px;
-	border:solid #F4F4F4 1px;
-	font-weight:bold;
-}
-.userData td.data {
-	background-color:#F4F4F4;
-	border:solid #E2E2E2 1px;
-	font-weight:normal;
-}
-/* END OF BADGE CSS */
-
-/* EVENT LIST CSS */
-.eventList, .eventSearch {
-	width:95%;
-	border:solid #F0F0F0 1px;
-	padding:2px;
-	-moz-border-radius-topLeft:15px;
-	-moz-border-radius-topRight:15px;
-	font-family:verdana;
-	font-size:9pt;
-}
-.eventList h2, .eventSearch h2 {
-	margin:0px;
-	width:100%;
-	font-family:verdana;
-	text-align:center;
-	font-size:11pt;
-	background-color: #F0F0F0;
-	color:gray;
-	-moz-border-radius-topLeft:15px;
-	-moz-border-radius-topRight:15px;
-	-moz-box-sizing:border-box;
-}
-.eventList {
-	width:98%;
-	border:solid #E0E0E0 1px;
-	font-size:9pt;
-	font-family:verdana;
-	/*background-color:#F4F4F4;*/
-	margin-top:2px;
-	-moz-box-sizing:border-box;
-	padding-bottom:25px;
-	-moz-border-radius-bottomLeft:15px;
-	-moz-border-radius-bottomRight:15px;
-}
-.event {
-	width:100%;
-	font-size:9pt;
-	font-family:verdana;
-	background-color:#F4F4F4;
-	margin-top:2px;
-	-moz-box-sizing:border-box;
-}
-.event td {
-	border-top:solid #E0E0E0 1px;
-	border-bottom:solid #E0E0E0 1px;
-	text-align:center;
-}
-.event th {
-	font-size:8pt;
-	text-align:center;
-	background:white;
-}
-.event td.left {
-	border-left:solid #E0E0E0 1px;
-}
-.event td.right {
-	border-right:solid #E0E0E0 1px;
-}
-.event td.empty {
-	background-color:white;
-	border-style:none;
-	font-size:1px;
-}
-.event a {
-	background-color:#E2E2E2;
-	padding:5px;
-	color:gray;
-	border:solid #F4F4F4 1px;
-	text-decoration:none;
-	font-weight:bold;
-	text-align:center;
-	-moz-border-radius:10px;
-	display:block;
-	width:80%;
-}
-.event a:hover {
-	border: solid #E2E2E2 1px;
-	background-color:#F0F0F0;
-	color:gray;
-}
-/* END EVENT LIST CSS */
-
-/* INSTRUCTIONS */
-.instructions {
-	width:95%;
-	border:solid #F0F0F0 1px;
-	padding:5px;
-	-moz-border-radius-topLeft:15px;
-	-moz-border-radius-topRight:15px;
-	font-family:verdana;
-	font-size:9pt;
-}
-/* END INSTRUCTIONS */
-
-/* SEARCH */
-.eventSearch form {
-	margin:0px;
-}
-.eventSearch .searchBtn {
-	background-color:#E2E2E2;
-	color:gray;
-	padding-top:1px;
-	padding-bottom:1px;
-	border:solid #F4F4F4 1px;
-	text-decoration:none;
-	font-weight:bold;
-	text-align:center;
-	-moz-border-radius:10px;
-}
-.searchBtn:hover {
-	border: solid #E2E2E2 1px;
-	background-color:#F0F0F0;
-	color:gray;
-}
-.advSearch input, .advSearch select{
-	font-size:8pt;
-}
-.advSearch .button {
-	background-color:#CF1D1D;
-	padding-left:2px;
-	padding-right:2px;
-	color:white;
-	border:solid #9C1616 1px;
-	text-decoration:none;
-	font-weight:bold;
-	text-align:center;
-	-moz-border-radius:10px;
-	display:block;
-	width:30px;
-	font-size:10pt;
-	margin-left:10px;
-	height:100%;
-}
-.advSearch .button:hover {
-	background-color:#9C1616;
-	color:#CF1D1D;
-	color:white;
-}
-.advSearch .compare-select {
-	width:75px;
-}
-.advSearch .filter-text {
-	width:98%;
-}
-* html .advSearch .filter-text {
-	width:97%;
-}
-.advSearch tr.border td {
-	font-size:1pt;
-	background-color:#CFCFCF;
-}
-/* END SEARCH */
-
-/* cart CSS */
-.cart {
-	width:95%;
-	background-color:#F0F0F0;
-	-moz-border-radius:15px;
-	padding:5px;
-	-moz-box-sizing:border-box;
-	font-family:verdana;
-	font-size:9pt;
-}
-.cart h2 {
-	width:100%;
-	font-size:12.5pt;
-	background-color:#E2E2E2;
-	text-align:center;
-	-moz-border-radius-topLeft:15px;
-	-moz-border-radius-topRight:15px;
-	margin:0px;
-	border:solid #E0E0E0 1px;
-	-moz-box-sizing:border-box;
-	color:gray;
-}
-.cartContent {
-	width:100%;
-	background-color:#F4F4F4;
-	margin:0px;
-	margin-top:5px;
-	margin-bottom:5px;
-	border:solid #E0E0E0 1px;
-	padding:5px;
-	-moz-box-sizing:border-box;
-	font-family:verdana;
-	font-size:9pt;
-}
-.cartContent a {
-	background-color:#CF1D1D;
-	padding:5px;
-	color:white;
-	border:solid #9C1616 1px;
-	text-decoration:none;
-	font-weight:bold;
-	text-align:center;
-	-moz-border-radius:10px;
-	display:block;
-	width:40px;
-	font-size:7pt;
-	float:right;
-	margin-left:10px;
-}
-.cartContent a:hover {
-	background-color:#9C1616;
-	color:#CF1D1D;
-	color:white;
-}
-.cartFooter {
-	width:100%;
-	background-color:#E2E2E2;
-	-moz-border-radius-bottomLeft:15px;
-	-moz-border-radius-bottomRight:15px;
-	margin:0px;
-	border:solid #E0E0E0 1px;
-	padding:5px;
-	-moz-box-sizing:border-box;
-	text-align:center;
-}
-.cartFooter a {
-	background-color:#E2E2E2;
-	padding:5px;
-	color:gray;
-	border:solid #F4F4F4 1px;
-	text-decoration:none;
-	font-weight:bold;
-	text-align:center;
-	-moz-border-radius:10px;
-	display:block;
-}
-.cartFooter a:hover {
-	background-color:#F0F0F0;
-	color:gray;
-}
-/* END OF cart CSS */
-
-/* SEARCH FILTER (Sort By) */
-.EMS_searchFilter {
-	width:98%;
-	border:solid #E0E0E0 1px;
-	font-size:9pt;
-	font-family:verdana;
-	margin-top:2px;
-	-moz-box-sizing:border-box;
-	background-color:#E2E2E2;
-	-moz-border-radius:15px;
-	color:#808080;
-	height:58px;
-}
-.EMS_searchFilter table {
-	float:right;
-	margin-right:5px;
-}
-.EMS_searchFilter td, .EMS_searchFilter select {
-	font-size:8pt;
-}
-.EMS_searchFilter input {
-	background-color:#E2E2E2;
-	padding:5px;
-	color:gray;
-	border:solid #F4F4F4 1px;
-	text-decoration:none;
-	font-weight:bold;
-	text-align:center;
-	-moz-border-radius:10px;
-	display:block;
-}
-.EMS_searchFilter input:hover {
-	background-color:#F0F0F0;
-	color:gray;
-}
-/* END SEARCH FILTER */
-</style>
-
-<link href="^Extras;/calendar/calendar-win2k-1.css" rel="stylesheet" type="text/css" />
diff --git a/docs/upgrades/templates-7.0.3/default_ems_template.tmpl b/docs/upgrades/templates-7.0.3/default_ems_template.tmpl
deleted file mode 100644
index e3bb290d3..000000000
--- a/docs/upgrades/templates-7.0.3/default_ems_template.tmpl
+++ /dev/null
@@ -1,275 +0,0 @@
-#EventManagerTmpl000001
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if session.var.adminOn>
-        <p><tmpl_var controls></p><br /><br />
-</tmpl_if>
-
-<table cellpadding="3" cellspacing="0" style="width:98%" class="EMS_view">
-<tr>
-	<td valign="top">
-
-		<tmpl_if canManageEvents>
-		<br />
-		<table cellpadding="5" cellspacing="0" style="width:100%">
-		<tr style="height:30px;">
-			<td valign="top" style="width:190px;"><a href="<tmpl_var manageEvents.url>">Manage Events</a></td>
-			<td>(Event Directors and Staff)</td>
-		</tr>
-		<tr style="height:30px">
-			<td valign="top" style="width:190px;"><a href="<tmpl_var manageRegistrants.url>">Manage Registrants</a></td>
-			<td>(Event Directors and Staff)</td>
-		</tr>
-		</tmpl_if>
-		
-		<tr style="height:30px">
-			<td valign="top" style="width:190px;"><a href="<tmpl_var managePurchases.url>">Modify Existing Badge</a></td>
-			<td>Add Events to a Badge you've already purchased</td>
-		</tr>
-		</table>
-	</td>
-	<td style="width:250px" valign="top" align="center">
-
-		<tmpl_if cart.purchaseLoop>
-		<div class="cart">
-			<h2>Shopping Cart</h2>
-			
-			<tmpl_loop cart.purchaseLoop>
-			<div class="cartContent">
-				<table border="0" cellpadding="0" cellspacing="0" width="100%">
-				<tbody>
-				<tr>
-					<td>
-						<b><tmpl_var purchase.mainEventTitle></b><br />
-						<tmpl_loop registrantInfoLoop>
-							Name: <tmpl_var firstName> <tmpl_var lastName>
-						</tmpl_loop>
-						<br />
-						Additional Price: $<tmpl_var newPrice> 					
-					</td>
-				</tr>
-				<tr>
-					<td style="border-top:solid silver 1px;">
-						<a href="<tmpl_var edit.url>" class="button"><img src="^Extras;/toolbar/bullet/edit.gif" style="border-style:none" alt="edit" /></a>
-						<a href="<tmpl_var delete.url>" class="button"><img src="^Extras;/toolbar/bullet/delete.gif" style="border-style:none" alt="delete" /></a>
-					</td>
-				</tr>
-				</tbody>
-				</table>				
-			</div>
-			</tmpl_loop>
-			
-			<a href="<tmpl_var emptyCart.url>">Empty Cart</a><br /><a href="<tmpl_var checkout.url>">Checkout</a>
-		</div>
-		</tmpl_if>
-	</td>
-</tr>
-</table>
-<br />
-
-<div>
-	<span class="StepLabel">Step 1: </span> Choose a badge from the list below, or click the link above to add events to a badge you've already purchased.
-</div>
-<br />
-
-<table width="100%" border="0" cellpadding="8" cellspacing="0">
-<tmpl_loop events_loop>
-<tr>
-	<td valign="top" colspan="7"><tmpl_var event></td>
-</tr>
-</tmpl_loop>
-</table>
-<tmpl_var paginateBar>
-~~~
-
-<style type="text/css">
-.EMS_view {
-	background-color:#F4F4F4;
-	border:solid #E2E2E2 1px;
-	-moz-border-radius:15px;
-}
-.EMS_view a {
-	width:200px;
-	background-color:#E2E2E2;
-	padding:5px;			
-	color:gray;
-	border:solid silver 1px;
-	text-decoration:none;
-	font-weight:bold;						
-	text-align:center;
-	-moz-border-radius:10px;
-	display:block;
-	font-size:7pt;
-	margin-left:10px;
-	-moz-box-sizing:border-box;
-}
-.EMS_view a:hover {
-	background-color:#F0F0F0;
-	border-color:#E2E2E2;
-}
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-.manageEvents {
-	margin-top:5px;
-	margin-bottom:5px;
-}
-.datacardtitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:13px;
-}
-
-.leftnav{
-	padding: 1px 1px 1px 1px;
-	background: white;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.leftnavon{
-	padding: 1px 1px 1px 1px;
-	background: yellow;
-	color: black;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-	border: 2px #3D5690 ridge;
-}
-.calendartitle {
-	background: #3D5690;
-	color: white;
-	font-family: verdana;
-	font-weight: bold;
-	font-size:11px;
-}
-.filter-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 105px;
-}
-.compare-select {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 76px;
-}
-.filter-text {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 114px;
-}
-.smLink {
-   font-family: verdana;
-   font-size: 10px;
-   font-weight: normal;
-   color: blue;
-}
-
-.StepLabel { font-family: Tahoma; font-size: 14pt; letter-spacing: 2pt; color: #234E9C; 
-               font-weight: bold }
-		.cart {			
-			background-color:#F0F0F0;
-			-moz-border-radius:15px;
-			padding:5px;	
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;
-			font-family:verdana;
-			font-size:9pt;
-			border:solid #E2E2E2 1px;
-			margin-right:10px;
-			text-align:left;
-		}
-		.cart h2 {
-			width:100%;
-			font-size:12.5pt;
-			background-color:#E2E2E2;
-			text-align:center;
-			-moz-border-radius-topLeft:15px;
-			-moz-border-radius-topRight:15px;
-			margin:0px;
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;
-			color:gray;			
-		}
-		.cartContent {			
-			background-color:#F4F4F4;			
-			margin:0px;
-			margin-top:5px;
-			margin-bottom:5px;
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;
-			box-sizing:border-box;
-			font-family:verdana;
-			font-size:9pt;
-		}
-		.cartContent a.button {
-			background-color:#CF1D1D;
-			padding:5px;			
-			color:white;
-			border:solid #9C1616 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			font-size:7pt;			
-			margin-left:10px;
-			margin-top:2px;
-			width:auto;	
-			display:block;
-			float:right;
-		}
-		.cartContent a.button:hover {
-			background-color:#9C1616;
-			color:#CF1D1D;
-			color:white;		
-		}		
-		.cartFooter {
-			width:100%;
-			background-color:#E2E2E2;			
-			-moz-border-radius-bottomLeft:15px;
-			-moz-border-radius-bottomRight:15px;
-			margin:0px;			
-			border:solid #E0E0E0 1px;
-			padding:5px;
-			-moz-box-sizing:border-box;	
-			box-sizing:border-box;			
-			text-align:center;
-		}
-		.cartFooter a {				
-			
-			background-color:#E2E2E2;
-			padding:5px;			
-			color:gray;
-			border:solid #F4F4F4 1px;
-			text-decoration:none;
-			font-weight:bold;						
-			text-align:center;
-			-moz-border-radius:10px;
-			display:block;
-		}
-		.cartFooter a:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-</style>
diff --git a/docs/upgrades/templates-7.0.3/default_ems_template_view_purchase.tmpl b/docs/upgrades/templates-7.0.3/default_ems_template_view_purchase.tmpl
deleted file mode 100644
index 7c52141d5..000000000
--- a/docs/upgrades/templates-7.0.3/default_ems_template_view_purchase.tmpl
+++ /dev/null
@@ -1,130 +0,0 @@
-#EventManagerTmpl000005
-<script type="text/javascript">
-function confirmDelete(url) {
-	if(confirm("Are you sure you wish to delete ALL registrations tied to this purchaseId?")) {
-		location.href=url;
-	}
-}
-</script>
-
-<tmpl_if session.var.adminOn>
-        <p><tmpl_var controls></p><br /><br />
-</tmpl_if>
-<h2><tmpl_var viewPurchaseTitle></h2>
-
-<tmpl_if canReturn><tmpl_if canReturnTransaction>
-	<div style="text-align:right;">
-		(<a href="<tmpl_var appUrl>?func=returnItem;tid=<tmpl_var transactionId>">Return Entire Purchase</a>)
-	</div>
-</tmpl_if></tmpl_if>
-
-<tmpl_loop purchasesLoop>
-<table width="100%" border="0" class="viewPurchase">
-<tr>
-	<td class="badgeTitle">Badge Name</td>
-	<td class="itinerary">
-	Itinerary&nbsp;&nbsp;<tmpl_if canReturn><tmpl_if canReturnItinerary>(<a href="<tmpl_var appUrl>?func=returnItem;pid=<tmpl_var purchaseId>">Return Entire Itinerary</a>)</tmpl_if></tmpl_if>
-	</td>
-</tr>
-<tr>
-	<td class="badgeName" valign="top">
-		<tmpl_var firstName> <tmpl_var lastName><br /><tmpl_if canReturn><a href="<tmpl_var appUrl>?func=editRegistrant;badgeId=<tmpl_var badgeId>"><img src="/extras/toolbar/bullet/edit.gif" alt="edit" border="0" /></a></tmpl_if><br />
-		<a href="<tmpl_var appUrl>?func=viewPurchase;badgeId=<tmpl_var badgeId>">View All Registrations for this Registrant</a>
-<br /><br /><tmpl_unless registrantView>
-<tmpl_if purchaseEventId><tmpl_if canAddEvents><tmpl_if canReturnItinerary><a href="<tmpl_var appUrl>?func=addEventsToBadge;bid=<tmpl_var badgeId>;eventId=<tmpl_var purchaseEventId>">Add Events To Badge</a><tmpl_else>Returned</tmpl_if></tmpl_if></tmpl_if>
-</tmpl_unless>
-	</td>
-	<td valign="top">
-		<table width="100%">
-		<tr>
-			<td><strong>Event Title</strong></td>
-			<td><strong>Event Dates</strong></td>
-		<tmpl_if canReturn>
-			<td><strong>Return Registration</strong></td>
-		</tmpl_if>
-		</tr>
-	<tmpl_loop regLoop>
-		<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>>
-			<td><tmpl_var sku>: <tmpl_var title></td>
-			<td><tmpl_var startDateHuman> - <tmpl_var endDateHuman></td>
-		<tmpl_if canReturn>
-			<td><tmpl_if returned>RETURNED<tmpl_else><a href="<tmpl_var appUrl>?func=returnItem;rid=<tmpl_var registrationId>">Return This Registration</a></tmpl_if></td>
-		</tmpl_if>
-		</tr>
-	</tmpl_loop>
-		</table>
-	</td>
-</tr>
-</table>
-</tmpl_loop>
-
-<br /><br />
-<tmpl_if hasIncompleteTransactions>
-
-<table width="100%">
-<tr><td colspan="6" align="center"><h2>Unpurchased Registrations</h2></td></tr>
-<tr><td colspan="6">Badge Id: <tmpl_var badgeId></td></tr>
-<tr><td height="10" colspan="6">&nbsp;</td></tr>
-<tr><th>Event Number</th>
-    <th>Title</th>
-    <th>RegistrationId</th>
-    <th>Returned</th>
-    <th>Transaction Id</th>
-    <th>Status</th>
-</tr>
-
-<tmpl_loop incompleteTransactions_loop>
-<tr><td height="10" colspan="6">&nbsp;</td></tr>
-<tr><td colspan="4" bgcolor="#a0a0a0">Purchase Id: <tmpl_var purchaseId>
-<tmpl_if canDeleteRegistration>
-<br/>
-<a href="javascript:void(confirmDelete('<tmpl_var deleteRegistration.url>'));"><tmpl_var deleteRegistration.label></a>
-</tmpl_if>
-</td>
-<td bgcolor="#a0a0a0"><tmpl_var form.header><tmpl_var form.transactionSelect></td><td bgcolor="#a0a0a0"><tmpl_var form.submit><tmpl_var form.footer></td></tr>
-  <tmpl_loop unpurchased_loop>
-   <tr 
-   <tmpl_if __ODD__>bgcolor="#e0e0e0"
-   <tmpl_else>bgcolor="#c0c0c0"
-</tmpl_if>
->
-   <td><tmpl_var sku></td>
-   <td><tmpl_var title></td>
-   <td><tmpl_var registrationId></td> 
-   <td align="center"><tmpl_var returned></td>
-   <td><tmpl_var transactionId></td>
-   <td><tmpl_var transactioStatus></td> 
-   </tr>
-  </tmpl_loop>
-</tmpl_loop>
-</table>
-</tmpl_if>
-~~~
-<style type="text/css">
-.viewPurchase {
-	border-bottom:solid silver 2px;
-}
-.viewPurchase td {
-	font-size:10pt;
-}
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-td.badgeTitle, td.itinerary   {
-	font-size:9pt;
-	font-weight:bold;	
-	border-bottom:solid gray 1px;
-}
-td.badgeName {
-	font-size:9pt;
-	font-style:italic;
-}
-h2 {
-	margin-bottom:3px;
-}
-</style>
diff --git a/docs/upgrades/templates-7.0.3/default_file_macro.tmpl b/docs/upgrades/templates-7.0.3/default_file_macro.tmpl
deleted file mode 100644
index c50404942..000000000
--- a/docs/upgrades/templates-7.0.3/default_file_macro.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#PBtmpl0000000000000039
-<a href="<tmpl_var file.url>"><img src="<tmpl_var file.icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var file.name>" /><tmpl_var file.name></a>
diff --git a/docs/upgrades/templates-7.0.3/default_pm_gantt_chart.tmpl b/docs/upgrades/templates-7.0.3/default_pm_gantt_chart.tmpl
deleted file mode 100644
index 297a05171..000000000
--- a/docs/upgrades/templates-7.0.3/default_pm_gantt_chart.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#ProjectManagerTMPL0003
-<script type="text/javascript">
-	var taskArray=<tmpl_var project.task.array>;
-</script>
-<div class="barPositions">
-   <tmpl_loop task.div.loop>
-      <tmpl_if task.isMilestone>      
-	     <div class="milestone" style="left:<tmpl_var task.div.left>px;top:<tmpl_var task.div.top>px;">&diams;</div>
-	  <tmpl_else>
-	     <div class="projectBar" style="left:<tmpl_var task.div.left>px;top:<tmpl_var task.div.top>px;width:<tmpl_var task.div.width>px;">	 
-		    <div class="statusBar" style="width:<tmpl_var task.div.percentComplete>%;"></div>
-            <tmpl_if task.hasPredecessor>   
-		       <div class="projectLineH" style="top:4px;left:50px;width:75px;height:28px;">
-	              <div class="projectLineV"></div>
-		       </div>
-	        </tmpl_if>
-	        <tmpl_if task.hasResource>
-		       <div class="projectLabel" style="left:<tmpl_var task.div.label.left>px;top:3px;margin-top:-3px;">
-		          <tmpl_var task.resource.name>			
-		       </div>
-	        </tmpl_if> 
-		 </div>
-	  </tmpl_if>	  
-   </tmpl_loop>
-   <a name="<tmpl_var project.table.width>" id="projectTableWidth"></a>
-   <a name="<tmpl_var project.scroll.percentWidth>" id="projectScrollPercentWidth"></a>
-   <table cellpadding="0" cellspacing="0" border="0" style="width:<tmpl_var scrollWidth>px;z-index:1;">
-      <tr class="monthNames">
-	     <tmpl_loop months.loop>
-		    <td colspan="<tmpl_var month.colspan>" class="monthName" style="height:20px;"><tmpl_var month.name></td>
-		 </tmpl_loop>
-	  </tr>	
-	  <tr class="dates">
-	     <tmpl_loop days.loop>
-		    <td  align="center" style="width:23px"><tmpl_var day.number></td>
-		 </tmpl_loop>
-	  </tr>
-	  <tmpl_loop task.count.loop>
-	     <tr>
-		    <td colspan="<tmpl_var total.colspan>" class="empty" style="height:21px;">&nbsp;</td>
-	     </tr>
-	  </tmpl_loop>
-   </table>
-   <br />
-</div>
-
-~~~
diff --git a/docs/upgrades/templates-7.0.3/default_pm_project_display.tmpl b/docs/upgrades/templates-7.0.3/default_pm_project_display.tmpl
deleted file mode 100644
index 3343d2a86..000000000
--- a/docs/upgrades/templates-7.0.3/default_pm_project_display.tmpl
+++ /dev/null
@@ -1,658 +0,0 @@
-#ProjectManagerTMPL0002
-<script type="text/javascript">
-	var JScolresize= "1";
-	var JScolmove= "1";
-	var JScolhide= "1";
-	var filtered = 0;
-	var sortable = new Array (0,0,0,0,0,0);
-	var filterable = new Array (0,0,0,0,0,0);
-
-	function init(tableName) {
-		sortableInit(tableName);
-	}
-</script>
-
-<script type="text/javascript">
-//<![CDATA[
-	var dayMS = 86400000;
-
-	var popTitle = "Add/Edit Task";
-
-	var dunits = "<tmpl_var project.durationUnits>";
-	var hoursPerDay = <tmpl_var project.hoursPerDay>;
-	var taskLength=<tmpl_var project.task.length>;
-
-	//---------------------------------------------------------------------
-	function doCalendar (fieldId) {
-		Calendar.setup({
-			inputField : fieldId,
-			ifFormat : "%Y-%m-%d",
-			showsTime : false,
-			step : 1,
-			timeFormat : "12",
-			firstDay : false
-		});
-	}
-
-	//---------------------------------------------------------------------
-	function buildMenuUrl (urltype,taskId) {
-		if(urltype == "edit") {
-			alert("edit task: "+taskId);
-		} else if(urltype == "insertAbove") {
-			alert("insert task above: "+taskId);
-		} else if(urltype == "insertBelow") {
-			alert("insert task below: "+taskId);
-		} else if(urltype == "delete") {
-			alert("delete task: "+taskId);
-		}
-	}
-
-	//---------------------------------------------------------------------
-	function closeImage() {
-		return '<tmpl_var extras>/close.gif';
-	}
-
-	//---------------------------------------------------------------------
-	function configureMilestone(box) {
-		var form = box.form;
-		if (box.checked==true) {
-			form.end.value=form.start.value;
-			form.duration.value=0;
-			form.duration.disabled=true;
-			form.end.disabled=true;
-			form.dependants.disabled=true;
-			form.resource.disabled=true;
-			form.percentComplete.disabled=true;
-			form.percentComplete.value=0;
-		} else {
-			form.end.disabled=false;
-			form.duration.disabled=false;
-			form.dependants.disabled=false;
-			form.resource.disabled=false;
-			form.percentComplete.disabled=false;
-			form.duration.value = (dunits == "hrs")?hoursPerDay:1;
-		}
-	}
-
-	//---------------------------------------------------------------------
-	function checkEditTaskForm (form) {
-		if (form.name.value == "") {
-			alert("<tmpl_var form.name.error>");
-			return;
-		} else if(form.start.value == "") {
-			alert("<tmpl_var form.start.error>");
-			return;
-		} else if(form.milestone.checked==false && form.end.value == "") {
-			alert("<tmpl_var form.end.error>");
-			return;
-		}
-		form.submit();
-	}
-
-	//---------------------------------------------------------------------
-	function intlDate(dateObj) {
-		return dateObj.getFullYear()+"-"+pad((dateObj.getMonth()+1))+"-"+pad(dateObj.getDate());
-	}
-
-	//---------------------------------------------------------------------
-	function toDateObj(date) {
-		var to = date.split("-");
-		var dateObj = new Date(to[0],(to[1]-1),to[2],0,0,1,0);
-		return dateObj;
-	}
-
-	//---------------------------------------------------------------------
-	function adjustTaskTimeFromDuration(start, end, duration, isTaskForm, predecessor, origStart, origEnd, seqNum) {
-		//set the form element
-		var form = duration.form;
-
-		//get today's date
-		var today = new Date();
-		var todayIntl = intlDate(today);
-		//set start and end date if not already set
-		if (start.value == "") start.value = todayIntl;
-		if (end.value == "") end.value = todayIntl;
-
-		//Convert predecessor hours to days
-		var taskDuration = duration.value;
-		if (dunits == "hrs") taskDuration = taskDuration / hoursPerDay;
-		var durationFloor = Math.floor(taskDuration);
-
-		//Handle task form and main form seperately due to differences in the forms
-		if (isTaskForm && taskDuration <= 0) {
-			//Convert to milestone if task is less or equal to zero
-			if (confirm("Zero duration tasks are considered Milestones.  Do you wish to change this task to a milestone?")) {
-				form.milestone.checked = true;
-				configureMilestone(form.milestone);
-			} else {
-				duration.value = form.orig_duration.value;
-			}
-			return;
-		} else if (taskDuration <= 0) {
-			//Do not let users zero out tasks
-			alert("Zero duration tasks are considered Milestones.  Please edit the task by clicking the link if you wish to change this task to a milestone");
-			return;
-		}
-
-		//create the start date
-		var aTo = start.value.split("-");
-		var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-
-		//add new duration days to the start date
-		toDate.setDate(toDate.getDate() + durationFloor);
-
-		//set end date to this date
-		end.value = intlDate(toDate);
-
-		//Set new duration in taskArray
-		taskArray[seqNum]["duration"] = duration.value;
-		//Adjust time based on new end date
-		adjustTaskTimeFromDate(start, end, duration, end, isTaskForm, predecessor, origStart, origEnd, seqNum);
-	}
-
-	//---------------------------------------------------------------------
-	function adjustTaskTimeFromDate (start, end, duration, element, isTaskForm, predecessor, origStart, origEnd, seqNum) {
-		//set the form element
-		var form = element.form;
-		//set original duration from task form to determine whether or not to continue to set duration
-		var orig_duration;
-
-		if (isTaskForm) {
-			if (form.milestone.checked == true) return;
-			orig_duration = form.orig_duration.value;
-		}
-
-		//Handle case where both start and end are empty
-		if (start.value == "" && end.value == "") {
-			//get today's date
-			var today = new Date();
-			var todayIntl = intlDate(today);
-			//set start and end date if not already set
-			start.value = todayIntl;
-			end.value = todayIntl;
-		}
-
-		//Handle case where one is set and the other isn't
-		if (end.value == "") end.value = start.value;
-		if (start.value == "") start.value = end.value;
-
-		if (isTaskForm && orig_duration == "") {
-			//Set duration if this is a new record
-			//Check to make sure start date comes before end date
-			var startcomp = start.value.replace(/-/g,"");
-			var endcomp = end.value.replace(/-/g,"");
-			if (startcomp > endcomp) {
-				alert("<tmpl_var form.greaterthan.error>");
-				if (element.name == "start") {
-					end.value = element.value;
-				} else {
-					start.value = element.value;
-				}
-				duration.value = (dunits == "hrs")?hoursPerDay:1;
-				return;
-			}
-
-			var d = getDaysInterval(start.value,end.value);
-			if (d == 0) d = 1;
-			if (dunits == "hrs") {
-				d = d * hoursPerDay;
-			}
-			duration.value = d;
-		} else {
-			//Set start/end if duration has been saved
-			var d = duration.value;
-			if (dunits == "hrs") {
-				//Convert to days
-				d = d / hoursPerDay;
-			}
-			//Round off duration or set it to zero if less than 1;
-			//alert("d = " + d + " floor = " + Math.floor(d));
-			if (d < 1) d = 0;
-			else d = Math.floor(d);
-
-			if (element.name.indexOf("start") > -1) {
-				//create the date
-				var aTo = start.value.split("-");
-				var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-				//add duration days to the start date
-				toDate.setDate(toDate.getDate() + d);
-				//set end date to this date
-				end.value = intlDate(toDate);
-			} else if(element.name.indexOf("end") > -1) {
-				//create the date
-				var aFrom = end.value.split("-");
-				var fromDate = new Date(aFrom[0],(aFrom[1]-1),aFrom[2],0,0,1,0);
-				//subtract duration days from the end date
-				fromDate.setDate(fromDate.getDate() - d);
-				//set start date to this date
-				start.value = intlDate(fromDate);
-			}
-		}
-
-		//Check Predecessors before moving stuff
-		var pred = predecessor.value;
-		if(pred != "") {
-			//Check to make sure that the dependency requirement for this task is still valid
-			//Get the predecessor end date
-			var taskStart = toDateObj(start.value);
-			var predTaskEnd;
-			if (isTaskForm) {
-				predTaskEnd = toDateObj(taskArray[pred]["end"]);
-			} else {
-				var predTaskEndId = "end_"+taskArray[pred]["id"]+"_formId"
-				predTaskEnd = toDateObj(document.getElementById(predTaskEndId).value);
-			}
-
-			if (taskStart.getTime() < predTaskEnd.getTime()) {
-				alert("<tmpl_var form.invalidMove.error>");
-				start.value = origStart.value;
-				end.value = origEnd.value;
-				return;
-			}
-		}
-
-		//Check all tasks past this one and move them forward if necessary (this only needs to happen on the main form)
-		if (!isTaskForm) {
-			arrangePredecessors(element,seqNum);
-		}
-		//reset orig start and end values
-		origStart.value = start.value;
-		origEnd.value = end.value;
-
-		if (!isTaskForm) {
-			//Adjust task form for
-			paintGanttChart();
-		}
-	}
-
-	//---------------------------------------------------------------------
-	function trim(str) {
-		return str.replace(/^\s+|\s+$/, '');
-	}
-
-	//---------------------------------------------------------------------
-	function arrangePredecessors (element,seqNum) {
-		for (var i = 1; i <= taskLength; i++) {
-			var seq = i;
-			var task = taskArray[seq];
-			var taskId = task["id"];
-			//Calculate duration and duraiton floor
-			var durationInDays = parseFloat(task["duration"]);
-			if (dunits == "hrs") durationInDays = durationInDays / hoursPerDay;
-			var durationFloor = Math.floor(durationInDays);
-			//alert("Duration Floor is: "+durationFloor);
-			//Get the current elements
-			var currElementStart = document.getElementById("start_"+taskId+"_formId");
-			var currElementEnd = document.getElementById("end_"+taskId+"_formId");
-			//alert("Current Start Date: "+currElementStart.value+"   Current End Date: "+currElementEnd.value);
-			//Skip the first record as it is the record that was changed
-			if (seq > 1) {
-				var predecessor = task["predecessor"];
-				//alert("predecessor for "+i+" is "+predecessor);
-				if (predecessor != "") {
-					var pred = taskArray[predecessor];
-					var predEndDate = toDateObj(pred["end"]);
-					var startDate = toDateObj(task["start"]);
-					//alert ("Pred End Date: "+intlDate(predEndDate));
-					//Make sure start date of this task is greater than the end date of the predecessor
-					if (startDate.getTime() <= predEndDate.getTime()) {
-						//Change the start and end dates of the task
-						//Get the day part of the predecessor
-						var predDayPart = parseFloat(pred["dayPart"]);
-						//alert("predDayPart: "+predDayPart);
-						if (predDayPart > 0) {
-							//The previous task took up part of a day.  Add the additional day part to the duration
-							durationInDays += predDayPart;
-							durationFloor = Math.floor(durationInDays);
-						}
-						//alert("Duration in Days: "+durationInDays+" Duration Floor: "+durationFloor);
-						//Set the start date of this task to the end date of the predecessor
-						currElementStart.value = pred["end"];
-						//Adjust end date for change in start date and update the object - start date is actually predEndDate now, so use the existing date object
-						predEndDate.setDate(predEndDate.getDate() + durationFloor);
-						currElementEnd.value = intlDate(predEndDate);
-						//alert("Set seq "+i+" to start: "+pred["end"]+" end: "+intlDate(predEndDate));
-					}
-				}
-			}
-
-			//Update task array with new start/end values
-			taskArray[seq]["start"] = currElementStart.value;
-			taskArray[seq]["end"] = currElementEnd.value;
-			taskArray[seq]["dayPart"] = (durationInDays - Math.floor(durationInDays));
-		}
-	}
-
-	//---------------------------------------------------------------------
-	function getDaysInterval(from,to) {
-		var aFrom = from.split("-");
-		var aTo = to.split("-");
-		var fromDate = new Date(aFrom[0],(aFrom[1]-1),aFrom[2],0,0,1,0);
-		var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-		var fromEpoch = fromDate.getTime();
-		var toEpoch = toDate.getTime();
-
-		var seconds = toEpoch - fromEpoch;
-		if (seconds == 0) return 0;
-		return (seconds/dayMS);
-	}
-
-	//---------------------------------------------------------------------
-	function pad(date) {
-		var str = ""+date;
-		if (str.length == 1) {
-			str = "0"+str;
-		}
-		return str;
-	}
-
-	//---------------------------------------------------------------------
-	function paintGanttChart () {
-		var status = AjaxRequest.submit(document.forms['editAll'],{
-                                      'onSuccess':function(req){ document.getElementById('gantt').innerHTML = req.responseText; }
-                                     });
-
-		var mwidth = document.getElementById("projectTableWidth").name + "px";
-		var swidth = document.getElementById("projectScrollPercentWidth").name + "%";
-		document.getElementById("mastertable").style.width=mwidth;
-		document.getElementById("scrolltd").style.width=swidth;
-	}
-
-	//---------------------------------------------------------------------
-	function validateDependant(field,origField,seqNum,start,end,duration,isTaskForm,origStart,origEnd) {
-		var pred = field.value;
-		var newTask = false;
-		if (pred != "") {
-			if (seqNum == "") seqNum = taskLength+1;
-			if (pred < 1) {
-				alert("<tmpl_var form.noPredecessor.error>");
-				field.value=origField.value;
-				return;
-			}
-			if (pred == seqNum) {
-				alert("<tmpl_var form.samePredecessor.error>");
-				field.value=origField.value;
-				return;
-			}
-			if (pred > seqNum) {
-				alert("<tmpl_var form.previousPredecessor.error>");
-				field.value = origField.value;
-				return;
-			}
-
-			//Set defaults if it's a new record and one of the other options hasn't been checked.
-			if (start.value == "" || end.value == "") {
-				//get today's date
-				newTask = true;
-				duration.value = (dunits == "hrs") ? hoursPerDay : 1;
-			}
-			//Get the predecessor end date and decide where the new start date belongs
-			var taskStart = start.value;
-			var taskStartObj = toDateObj(taskStart);
-			var predTaskEnd = taskArray[pred]["end"];
-			var predTaskEndObj = toDateObj(predTaskEnd);
-
-			//Change start date if it comes before predecessor end date
-			if (newTask || (taskStartObj.getTime() < predTaskEndObj.getTime())) {
-				//Convert predecessor hours to days
-				var taskDuration = duration.value;
-				if(dunits == "hrs") taskDuration = taskDuration / hoursPerDay;
-				var durationFloor = Math.floor(taskDuration);
-
-				//Get the predecessor dayPart
-				var predDayPart = parseFloat(pred["dayPart"]);
-				if (predDayPart > 0) {
-					//The previous task took up part of a day.  Add the additional day part to the duration
-					taskDuration += predDayPart;
-					durationFloor = Math.floor(durationInDays);
-				}
-
-				//Set the start date of this task to the end date of the predecessor
-				start.value = predTaskEnd;
-				//Adjust end date for change in start date
-				adjustTaskTimeFromDate(start,end,duration,start,isTaskForm,field,origStart,origEnd,seqNum);
-				return;
-			}
-		}
-
-		//Repaint
-		if(!isTaskForm) {
-			//Set new predecessor in taskArray
-			taskArray[seqNum]["predecessor"] = pred;
-			paintGanttChart();
-			}
-		}
-
-		addEvent(window, "load", initPopUp);
-//]]>
-</script>
-<tmpl_var form.header>
-<table cellpadding="0" cellspacing="0" border="0" class="project" id="mastertable" style="width:<tmpl_var project.table.width>px;">
-   <tbody>
-      <tr>
-         <td style="width:20px;height:20px;">&nbsp;</td>
-	     <td style="width:300px;" align="center">Task Name</td>
-	     <td style="width:70px;" align="center">Duration</td>
-	     <td style="width:70px;" align="center">Start</td>
-	     <td style="width:70px;" align="center">Finish</td>
-	     <td style="width:30px;" align="center">Pred</td>
-	     <td rowspan="<tmpl_var project.gantt.rowspan>" valign="top" id="scrolltd" style="border-style:none;width:<tmpl_var project.scroll.percentWidth>%;">
-		<div class="scroller" id="gantt">
-			<tmpl_var project.ganttChart>
-		</div>
-	     </td>
-      </tr>
-      <tr>
-	     <td colspan="6">&nbsp;</td>
-      </tr>
-      <tmpl_loop task.loop>
-      <tr id="<tmpl_var task.row.id>">
-	     <td align="center" style="height:20px"><tmpl_var task.number></td>
-	     <td align="left" style="height:20px">
-	        <tmpl_if task.canAdd>
-		       <a href="<tmpl_var task.edit.url>" class="submodal"><tmpl_var task.name></a>
-		    <tmpl_else>
-		       <tmpl_var task.name>
-		    </tmpl_if>
-	     </td>
-	     <td align="center" style="height:20px"><tmpl_var task.duration> <tmpl_var task.duration.units></td>
-	     <td align="center" style="height:20px"><tmpl_var task.start></td>
-	     <td align="center" style="height:20px"><tmpl_var task.end></td>
-	     <td align="center" style="height:20px"><tmpl_var task.dependants></td>
-      </tr>
-      </tmpl_loop>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-   </tbody>
-</table>
-<tmpl_var form.footer>
-
-<div id="links">
-<!-- 	<tmpl_if project.canEdit><a href="<tmpl_var task.resources.url>"><tmpl_var task.resources.label></a>&nbsp;|&nbsp;</tmpl_if> -->
-	<tmpl_if task.canAdd><a href="<tmpl_var task.add.url>" class="submodal"><tmpl_var task.add.label></a>&nbsp;|&nbsp;</tmpl_if>
-	<a href="<tmpl_var task.back.url>"><tmpl_var task.back.label></a>
-</div>
-<script type="text/javascript">
-	init("mastertable");
-</script>
-~~~
-<style type="text/css">
-body, html {
-	margin:0px;
-	padding:0px;
-}
-.project {
-	position:relative;
-	margin-top:5px;
-	margin-left:5px;
-}
-.project td {
-	border:solid silver 1px;
-	border-bottom:solid gray 1px;
-	font-size:9pt;
-	font-family:arial;
-}
-.project a {
-	color:#000000;
-	font-weight: normal;
-	font-size: 9pt;
-	text-decoration: none;
-}
-.project a:hover {
-	color:#7AB7E9;
-	font-weight: normal;
-	font-size: 9pt;
-	text-decoration: none;
-}
-.taskname {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 295px;
-}
-.taskduration {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 25px;
-}
-.taskdate {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 68px;
-}
-.taskdependant {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 20px;
-}
-tr.monthNames td {
-	text-align:center;
-}
-tr.dates td {
-	width:16px;
-}
-div.scroller {
-	overflow:scroll;
-	position:relative;
-	width:400px;
-}
-* html div.scroller {
-	overflow-x:scroll;
-}
-td.empty {
-	background-color:transparent;
-	border-style:none;
-	height:20px;
-}
-div.barPositions {
-	position:relative;
-}
-div.projectBar {
-	background-color:#7AB7E9;
-	position:absolute;
-	height:10px;
-	z-index:2;
-	padding:0px;
-	margin:0px;
-	font-size:1pt;
-}
-div.statusBar {
-	background-color:#000;
-	position:absolute;
-	height:5px;
-	z-index:3;
-	padding:0px;
-	top:2px;
-	margin:0px;
-	font-size:1pt;
-}
-div.projectLineH {
-	background: url('images/dot.gif') top repeat-x;
-	font-size:1pt;
-	text-align:right;
-	position:absolute;
-}
-div.projectLineV {
-	width:1px;
-	background-color:black;
-	position:relative;
-	font-size:1pt;
-	height:100%;
-	float:right;
-}
-div.projectLabel {
-	position:absolute;
-	margin-top:-3px;
-	white-space:nowrap;
-	font-family: verdana;
-	font-size:8px;
-}
-div.milestone {
-	color:#000000;
-	position:absolute;
-	z-index:4;
-	margin:0px;
-	padding:0px;
-	margin-top:-3px;
-	font-size: 10px;
-	font-family: times;
-}
-#links {
-	margin-top:7px;
-	margin-left:5px;
-	font-family:arial;
-	font-size:9pt;
-}
-#links a {
-	color:#7AB7E9;
-}
-</style>
-
-<style type="text/css">
-.popUp {
-	width:100%;
-	border:solid black 0px;
-	background-color:#F5F5F5;
-}
-.popUp td {
-	font-size:9pt;
-	font-family:arial;
-	border-top:solid #E0E0E0 1px;
-}
-.popUp tr.clear td {
-	border-style:none;
-	background-color:#F0F0F0;
-}
-.popUp tr.clearNoBG td {
-	border-style:none;
-}
-.popUp td.header {
-	font-weight:bold;
-}
-a.saveBtn {
-	width:40px;
-	height:15px;
-	background-color:silver;
-	padding:1px;
-	padding-left:5px;
-	padding-right:5px;
-	color:white;
-	border:solid gray 1px;
-	text-decoration:none;
-	font-weight:bold;
-	display:block;
-	float:right;
-	text-align:center;
-}
-a.saveBtn:hover {
-	background-color:#F0F0F0;
-	color:gray;
-}
-</style>
diff --git a/docs/upgrades/templates-7.0.3/default_pm_view.tmpl b/docs/upgrades/templates-7.0.3/default_pm_view.tmpl
deleted file mode 100644
index ab2a79506..000000000
--- a/docs/upgrades/templates-7.0.3/default_pm_view.tmpl
+++ /dev/null
@@ -1,144 +0,0 @@
-#ProjectManagerTMPL0001
-<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>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<script type="text/javascript">
-   function doDelete(url) {
-      if( confirm('<tmpl_var project.delete.warning>') ) {
-	     location.href=url;
-	  }
-   }
-</script>
-
-<table cellpadding="3" cellspacing="0" border="0" class="projectView">
-   <tr>
-	   <td colspan="3" style="border-style:none;text-align:left;" valign="bottom">
-		   <tmpl_if canEditProjects><a href="<tmpl_var project.create>"><tmpl_var project.create.label></a><tmpl_else>&#160;</tmpl_if>
-	   </td>
-	   <td style="border-style:none;text-align:right" colspan="3">
-	      <form action="" style="margin:0px;">
-		     <p style="margin:0px;">
-			    <select>
-				   <option>All Projects</option>
-				</select>
-			 </p>
-		  </form>
-	   </td>
-    </tr>
-
-    <tr class="header">
-	   <td><tmpl_var project.name.label></td>
-	   <td><tmpl_var project.startDate.label></td>
-	   <td><tmpl_var project.endDate.label></td>
-	   <td><tmpl_var project.cost.label></td>
-	   <td><tmpl_var project.complete.label></td>
-	   <tmpl_if canEditProjects>
-	      <td><tmpl_var project.actions.label></td>
-	   </tmpl_if>
-    </tr>
-	<tmpl_if noProjects>
-	   <tr><td class="projectNames" colspan="<tmpl_var empty.colspan>"><tmpl_var noProjects></td></tr>
-	<tmpl_else>
-	   <tmpl_loop project.loop>
-	      <tr class="alt">
-	         <td class="projectNames">
-			    <a href="<tmpl_var project.view.url>"><tmpl_var project.name.data></a>
-			 </td>
-	         <td><tmpl_var project.startDate.data></td>
-	         <td><tmpl_var project.endDate.data></td>
-	         <td><tmpl_var project.cost.data.int></td>
-	         <td>
-		        <div class="completeContainer">
-			       <div class="completeBar" style="width:<tmpl_var project.complete.data.int>%;"></div>
-			       <div class="completeText"><tmpl_var project.complete.data.float>%</div>
-		        </div>
-	         </td>
-			 <tmpl_if canEditProjects>
-	            <td>
-			        <!-- <a href="#"><img src="<tmpl_var extras>/add.gif" style="border-style:none;" alt="" /></a>&nbsp; -->
-				   <a href="<tmpl_var project.edit.url>"><img src="<tmpl_var extras>/edit.gif" style="border-style:none;" title="<tmpl_var project.edit.title>" alt="edit" /></a>&nbsp;
-				   <a href="javascript:void(doDelete('<tmpl_var project.delete.url>'));"><img src="<tmpl_var extras>/delete.gif" style="border-style:none;" title="<tmpl_var project.delete.title>" alt="delete" /></a>
-			    </td>
-             </tmpl_if>
-		  </tr>
-	   </tmpl_loop>
-	</tmpl_if>
-</table>
-
-~~~
-<style type="text/css">
-.fontSettings {
-	font-family:arial;
-	font-size:9pt;
-}
-.projectView td {
-	border:solid silver 1px;
-	border-bottom:solid gray 1px;
-	font-size:9pt;
-	font-family:arial;
-}
-.projectView a {
-	color:#3391DD;
-}
-tr.header td {
-	font-weight:bold;
-}
-td.projectNames {
-	white-space:nowrap;
-}
-td.projectNames a {
-	display:block;
-	color:#3391DD;
-}
-td.projectNames a.level1 {
-	margin:0 10px;
-}
-td.projectNames a.level2 {
-	margin:0px 10px 0px 20px;
-}
-td.projectNames a.level3 {
-	margin:0px 10px 0px 30px;
-}
-td.projectNames a.level4 {
-	margin:0px 10px 0px 40px;
-}
-td.projectNames a.level5 {
-	margin:0px 10px 0px 50px;
-}
-tr.alt td {
-	background-color:#F0F0F0;
-}
-div.completeContainer {
-	position:relative;
-	z-index:0;
-	background: #000;
-	color:white;
-	text-align:center;
-}
-div.completeBar {
-	position:absolute;
-	height:100%;
-	top:0px;
-	left:0px;
-	background: #7AB7E9;
-	z-index:1;
-}
-div.completeText {
-	position:relative;
-	height:100%;
-	top:0px;
-	left:0px;
-	z-index:2;
-}
-</style>
diff --git a/docs/upgrades/templates-7.0.3/default_poll.tmpl b/docs/upgrades/templates-7.0.3/default_poll.tmpl
deleted file mode 100644
index 516efcabd..000000000
--- a/docs/upgrades/templates-7.0.3/default_poll.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-#PBtmpl0000000000000055
-<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>
-
-<div class="fontSettings">
-<tmpl_if description>
-	<tmpl_var description>
-	<p />
-</tmpl_if>
-
-<span class="pollQuestion"><tmpl_var question></span><br />
-
-<tmpl_if canVote>
-	<tmpl_var form.start>
-	<tmpl_loop answer_loop>
-		<tmpl_var answer.form> <tmpl_var answer.text><br />
-	</tmpl_loop>
-	<p />
-	<tmpl_var form.submit>
-	<tmpl_var form.end>
-<tmpl_else>
-	<tmpl_if hasImageGraph>
-		<img src="<tmpl_var graphUrl>" alt="graph" />
-	<tmpl_else>
-		<tmpl_loop answer_loop>
-			<span class="pollAnswer"><tmpl_var answer.text><br /></span>
-			<table cellpadding=0 cellspacing=0 border=0>
-			<tr>
-				<td width="<tmpl_var answer.graphWidth>" class="pollColor">^Spacer(1,1);</td>
-				<td class="pollAnswer">&nbsp;&nbsp;<tmpl_var answer.percent>% (<tmpl_var answer.total>)</td>
-			</tr>
-			</table>
-		</tmpl_loop>
-		<span class="pollAnswer"><hr size="1"><b><tmpl_var responses.label>:</b> <tmpl_var responses.total></span>
-	</tmpl_if>
-</tmpl_if>
-</div>
-
-
-~~~
-<style type="text/css">
-.fontSettings {
-	font-family:arial;
-	font-size:9pt;
-}
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.pollQuestion {
-	border-bottom:solid gray 1px;
-	font-family:arial;
-	font-size:10pt;
-	font-weight:bold;				
-}
-.pollColor {
-	background-color:gray;
-}
-</style>
diff --git a/docs/upgrades/templates-7.0.3/default_shoppingcart_template.tmpl b/docs/upgrades/templates-7.0.3/default_shoppingcart_template.tmpl
deleted file mode 100644
index 2819da1d1..000000000
--- a/docs/upgrades/templates-7.0.3/default_shoppingcart_template.tmpl
+++ /dev/null
@@ -1,51 +0,0 @@
-#PBtmplVSC0000000000001
-<tmpl_if cartEmpty>
-<tmpl_var cartEmpty.message>
-<tmpl_else>
-
-<tmpl_var updateForm.header>
-<table>	
-	<tr align="left">
-		<th></th>
-		<th style="border-bottom: 2px solid black">Product</th>
-		<th style="border-bottom: 2px solid black">Quantity</th>
-		<th style="border-bottom: 2px solid black">Price</th>
-	</tr>
-
-	<tmpl_if normalItems>
-	</tmpl_if>
-
-	<tmpl_loop normalItemsLoop>
-	<tr>
-		<td><tmpl_var deleteIcon></td>
-		<td align="left"><tmpl_var name></td>
-		<td align="center"><tmpl_var quantity.form></td>
-		<td align="right"><tmpl_var price></td>
-	</tr>
-	</tmpl_loop>
-
-	<tmpl_loop recurringItemsLoop>
-	<tr>
-		<td><tmpl_var deleteIcon></td>
-		<td align="left"><tmpl_var name></td>
-		<td align="center"><tmpl_var quantity.form></td>
-		<td align="right"><tmpl_var price></td>
-	</tr>
-</tmpl_loop>
-	<tr style="border-top: 1px solid black">
-		<td></td>
-		<td style="border-top: 1px solid black">&nbsp;</td>
-		<td align="right" style="border-top: 1px solid black"><b>Total</b></td>
-		<td align="right" colspan="3" style="border-top: 1px solid black"><b><tmpl_var total></b></td>
-	</tr>
-
-</table>
-
-<tmpl_var updateForm.button>
-<tmpl_var updateForm.footer>
-
-<tmpl_var checkoutForm.header>
-<tmpl_var checkoutForm.button>
-<tmpl_var checkoutForm.footer> 
-
-</tmpl_if>
diff --git a/docs/upgrades/templates-7.0.3/default_submission.tmpl b/docs/upgrades/templates-7.0.3/default_submission.tmpl
deleted file mode 100644
index 2330d2566..000000000
--- a/docs/upgrades/templates-7.0.3/default_submission.tmpl
+++ /dev/null
@@ -1,378 +0,0 @@
-#PBtmpl0000000000000067
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<div class="defaultSubmissionDetails">
-<tmpl_if avatar.url>
-<div style="width: 100%; text-align: center;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>	
-	<b><tmpl_var user.label>:</b> 
-		<tmpl_if user.isVisitor>
-			<tmpl_var username>
-		<tmpl_else>
-			<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-		</tmpl_if>
-		<br />
-	<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-	<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-	<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-		<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-		</tmpl_unless>
-		<br />
-	<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_var status> [ <tmpl_if isArchived> <a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	<tmpl_else>	
-		<tmpl_if user.isPoster>
-			<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-		</tmpl_if>	
-	</tmpl_if>	
-</div>
-
-<div class="collaborationThreadContent">
-<p><b><tmpl_var userDefined2> <tmpl_var userDefined3></b></p>
-	<tmpl_var content>
-</div>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>">
-					<tmpl_if isImage>
-						<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-					<tmpl_else>
-						<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-					</tmpl_if>
-				</a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>" class="controlLink"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>" class="controlLink"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>" class="controlLink"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<div style="clear:both;"></div>
-
-<tmpl_if repliesAllowed>
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="id<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">	
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-<tmpl_if avatar.url>
-<td style="padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</td>
-</tmpl_if>
-							<td style="padding-right: 25px;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-							</td>
-						</tr>
-						</table>
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;">
-								<a href="<tmpl_var url>">
-									<tmpl_if isImage>
-										<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-									<tmpl_else>
-										<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-									</tmpl_if>
-								</a>
-							</div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>" class="controlLink"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>" class="controlLink"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>" class="controlLink"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="id<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-<tmpl_if avatar.url>
-<td style="padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</td>
-</tmpl_if>
-							<td style="padding-right: 25px;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />	
-								<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-							</td>
-						</tr>
-						</table>
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;">
-									<a href="<tmpl_var url>">
-										<tmpl_if isImage>
-											<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-										<tmpl_else>
-											<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-										</tmpl_if>
-									</a>
-								</div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>" class="controlLink"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>" class="controlLink"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>" class="controlLink"><tmpl_var delete.label></a>
-								</tmpl_if><br />
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>" class="controlLink"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>" class="controlLink"><tmpl_var back.label></a>
-	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>" class="controlLink"><tmpl_var next.label></a>				
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>" class="controlLink"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>" class="controlLink"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>" class="controlLink"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>" class="controlLink"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>" class="controlLink"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>" class="controlLink"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>" class="controlLink"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-	<br />
-</div>
-~~~
-<style type="text/css">
-.defaultSubmissionDetails
-{
-	float: right; 		
-	padding: 2px; 
-	margin: 2px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:20px;
-}
-
-.defaultSubmissionDetails a
-{
-	color:#29587E;
-}
-
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	background-color: #eeeeee;
-	padding: 3px;
-}
-.postData td {
-	font-size: 9pt;
-	color: black;
-	font-family:arial;
-}
-.postControls {
-	border-top: 1px solid #cccccc;
-	background-color: #676767;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-	clear:both;
-	width:100%;
-	display:block;
-	-moz-box-sizing:border-box;
-	text-align:right;
-	margin-top:1px;
-}
-.postControls a:link, .postControls a:visited
-{
-	text-decoration:underline;
-	color:white;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.threadData {
-	font-size: 11px;
-	padding: 3px;
-	font-family:arial;
-}
-
-
-.collaborationThreadContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-</style>
diff --git a/docs/upgrades/templates-7.0.3/default_thread.tmpl b/docs/upgrades/templates-7.0.3/default_thread.tmpl
deleted file mode 100644
index 9235842d1..000000000
--- a/docs/upgrades/templates-7.0.3/default_thread.tmpl
+++ /dev/null
@@ -1,272 +0,0 @@
-#PBtmpl0000000000000032
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-	
-<div style="float: left; width: 70%">
-	<h2><a href="<tmpl_var collaboration.url>"><tmpl_var collaboration.title></a></h2>
-</div>
-<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-</div>
-<div style="clear: both;"></div>
-
-<tmpl_if layout.isFlat>
-<!-- begin flat layout -->
-	<tmpl_loop post_loop>
-		<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-			<a name="id<tmpl_var assetId>"></a>
-			<div class="postSubject">
-				<tmpl_var title>
-			</div>
-			<div class="postData">
-<tmpl_if avatar.url>
-<div style="float: left; padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>
-				<div style="float: left; padding-right: 25px;">
-					<b><tmpl_var user.label>:</b> 
-						<tmpl_if user.isVisitor>
-							<tmpl_var username>
-						<tmpl_else>
-							<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-						</tmpl_if>
-						<br />
-					<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-				</div>	
-				<div>
-					<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-					<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-						<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-						</tmpl_unless>
-						<br />
-					<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <a href="<tmpl_var approve.url>"><tmpl_var approve.label></a> | <a href="<tmpl_var deny.url>"><tmpl_var deny.label></a> ]<br />
-					<tmpl_else>	
-						<tmpl_if user.isPoster>
-							<b><tmpl_var status.label>:</b> <tmpl_var status> [ <tmpl_if isArchived> <a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-						</tmpl_if>	
-					</tmpl_if>	
-				</div>	
-			</div>
-			<div class="postMessage">
-				<tmpl_var content>
-<tmpl_loop attachment_loop>
-	<div style="float: left; padding: 5px;">
-		<a href="<tmpl_var url>">
-			<tmpl_if isImage>
-				<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-			<tmpl_else>
-				<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>">< <tmpl_var filename>
-			</tmpl_if>
-		</a>
-	</div>
-</tmpl_loop>
-<div style="clear: both;"></div>
-
-			</div>
-			<tmpl_unless isLocked>
-				<div class="postControls">
-					<tmpl_if user.canReply>
-						<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull; 
-					</tmpl_if>
-					<tmpl_if user.canEdit>
-						<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
-						<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-					</tmpl_if>
-				</div>
-			</tmpl_unless>
-		</div>
-	</tmpl_loop>
-<!-- end flat layout -->
-</tmpl_if>
-
-<tmpl_if layout.isNested>
-<!-- begin nested layout -->
-	<tmpl_loop post_loop>
-		<div style="margin-left: <tmpl_var depthX10>px;">
-			<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-				<a name="id<tmpl_var assetId>"></a>
-				<div class="postSubject">
-					<tmpl_var title>
-				</div>
-				<div class="postData">
-<tmpl_if avatar.url>
-<div style="float: left; padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>
-					<div style="float: left; padding-right: 25px;">
-						<b><tmpl_var user.label>:</b> 
-							<tmpl_if user.isVisitor>
-								<tmpl_var username>
-							<tmpl_else>
-								<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-							</tmpl_if>
-							<br />
-						<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-					</div>	
-					<div>
-						<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-						<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-							<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-							</tmpl_unless>
-							<br />
-							<tmpl_if user.isPoster>
-								<b><tmpl_var status.label>:</b> <tmpl_var status> [ <tmpl_if isArchived> <a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-							</tmpl_if>	
-					</div>	
-				</div>
-				<div class="postMessage">
-					<tmpl_var content>
-<tmpl_loop attachment_loop>
-	<div style="float: left; padding: 5px;">
-		<a href="<tmpl_var url>">
-			<tmpl_if isImage>
-				<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-			<tmpl_else>
-				<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-			</tmpl_if>
-		</a>
-	</div>
-</tmpl_loop>
-<div style="clear: both;"></div>
-
-				</div>
-				<tmpl_unless isLocked>
-					<div class="postControls">
-						<tmpl_if user.canReply>
-							<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull;
-						</tmpl_if>
-						<tmpl_if user.canEdit>
-							<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
-							<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-						</tmpl_if>
-					</div>
-				</tmpl_unless>
-			</div>
-		</div>
-	</tmpl_loop>
-<!-- end nested layout -->
-</tmpl_if>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination" style="margin-top: 20px;">
-		[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-	</div>
-</tmpl_if>
-
-<div style="margin-top: 20px;" class="bottomControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> &bull;
-	</tmpl_if>	
-	<tmpl_if next.url>
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> &bull; 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a> &bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a> &bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a> &bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a> &bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-	.postBorder {
-		border: 1px solid #cccccc;
-		margin-bottom: 10px;
-	}
- 	.postBorderCurrent {
-		border: 3px dotted black;
-		margin-bottom: 10px;
-	}
-	.postSubject {
-		border-bottom: 1px solid #cccccc;
-		font-weight: bold;
-		padding: 3px;
-	}
-	.postData {
-		border-bottom: 1px solid #cccccc;
-		font-size: 9pt;
-		background-color: #eeeeee;
-		color: black;
-		padding: 3px;
-	}
-	.postData a {
-		color:#29587E;
-		text-decoration:underline;
-	}
-	.postData a:hover {
-		text-decoration:none;
-	}
-	.postControls {
-		border-top: 1px solid #cccccc;
-		background-color: #676767;
-		color: black;
-		padding: 3px;
-		text-align:right;
-	}
-	.postControls a:link, .postControls a:visited {
-		color:white;
-		text-decoration:underline;
-	}
-	.postControls a:hover {
-		text-decoration:none;
-	}
-	.bottomControls {
-		background-color:#676767;
-		padding: 3px;
-		text-align:right;
-	}
-	.bottomControls a:link, .bottomControls a:visited {
-		color:white;
-		text-decoration:underline;
-	}	
-	.bottomControls a:hover {
-		text-decoration:none;
-	}
-	.postMessage {
-		padding: 3px;
-	}
-	.currentThread {
-		background-color: #eeeeee;
-	}
-	.threadHead {
-		font-weight: bold;
-		border-bottom: 1px solid #cccccc;
-		font-size: 9pt;
-		background-color: #eeeeee;
-		color: black;
-		padding: 3px;
-	}
-	.threadData {
-		font-size: 11px;
-		padding: 3px;
-	}
-</style>
diff --git a/docs/upgrades/templates-7.0.3/default_tt_row.tmpl b/docs/upgrades/templates-7.0.3/default_tt_row.tmpl
deleted file mode 100644
index af1511fd5..000000000
--- a/docs/upgrades/templates-7.0.3/default_tt_row.tmpl
+++ /dev/null
@@ -1,64 +0,0 @@
-#TimeTrackingTMPL000003
-<table class="timeTracking02" cellpadding="3" cellspacing="0">
-<tbody id="ttbody">
-   <tr class="tt_title" id="tt_title">
-      <td colspan="4" align="left"><tmpl_var time.report.header></td>
-	  <td colspan="2" align="right"><tmpl_var time.report.totalHours.label> <strong style="color:red;" id="totalHours"><tmpl_var time.totalHours></strong></td>
-   </tr>
-   <tr class="tt_header" id="tt_header">
-      <td width="10%"><tmpl_var time.report.date.label></td>
-	  <td width="20%"><tmpl_var time.report.project.label></td>
-	  <td width="20%"><tmpl_var time.report.task.label></td>
-	  <td width="10%"><tmpl_var time.report.hours.label></td>
-	  <td width="40%"><tmpl_var time.report.comments.label></td>
-	  <td>&#160;</td>
-   </tr>
-   <tmpl_loop time.entry.loop>
-      <tr id="<tmpl_var row.id>">
-         <td class="cell"><tmpl_var form.taskEntryId><tmpl_var form.date></td>
-         <td class="cell"><tmpl_var form.project></td>
-         <td class="cell"><tmpl_var form.task></td>
-         <td class="cell"><tmpl_var form.hours></td>
-         <td class="cell"><tmpl_var form.comments></td>
-         <td><img src="<tmpl_var extras>/delete.gif" border="0" onclick="removeRow('<tmpl_var row.id>')" style="cursor:pointer" alt="delete" /></td>
-      </tr>
-   </tmpl_loop>
-   <tr class="tt_empty" id="tt_empty">
-      <td colspan="6" style="border-top:solid gray 2px;">
-	     <table width="100%" cellpadding="2" cellspacing="0">
-			<tr>
-				<td align="left"><a href="<tmpl_var report.lastWeek.url>" class="PM_blueLink"><b>&lsaquo;</b> Last Week</a></td>
-				<td align="right"><a href="<tmpl_var report.nextWeek.url>" class="PM_blueLink">Next Week <b>&rsaquo;</b></a></td>
-			</tr>
-			<tr>
-				<td colspan="2" style="border-bottom:solid #F0F0F0 1px;">&nbsp;</td>
-			</tr>
-			<tr>
-				<td style="width:60%;" align="left">
-					<tmpl_var time.report.complete.label><tmpl_var form.isComplete>
-				</td>
-				<td style="width:40%" align="right">
-					<input type="button" value="<tmpl_var time.add.row.label>" onclick="addRow();" /> &#160; <input type="submit" value="<tmpl_var time.save.label>" />
-				</td>			
-			</tr>
-	      </table>		
-	   </td>
-	</tr>
- </tbody>
-</table>
-
-<tmpl_unless report.isComplete>
-<table style="display:none" id="tt_table">
-   <tbody>
-      <tr id="<tmpl_var row.id>">
-         <td class="cell"><tmpl_var form.taskEntryId><tmpl_var form.date></td>
-         <td class="cell"><tmpl_var form.project></td>
-         <td class="cell"><tmpl_var form.task></td>
-         <td class="cell"><tmpl_var form.hours></td>
-         <td class="cell"><tmpl_var form.comments></td>
-         <td><img src="<tmpl_var extras>/delete.gif" border="0" onclick="removeRow()" style="cursor:pointer" alt="delete" /></td>
-      </tr>
-   </tbody>
-</table>
-</tmpl_unless>
-~~~
diff --git a/docs/upgrades/templates-7.0.3/default_webgui_password_recovery_template.tmpl b/docs/upgrades/templates-7.0.3/default_webgui_password_recovery_template.tmpl
deleted file mode 100644
index f5af041af..000000000
--- a/docs/upgrades/templates-7.0.3/default_webgui_password_recovery_template.tmpl
+++ /dev/null
@@ -1,29 +0,0 @@
-#PBtmpl0000000000000014
-<h2><tmpl_var title></h2>
-
-<tmpl_if recover.message>
-	<tmpl_var recover.message>
-</tmpl_if>
-
-<tmpl_var recover.form.header>
-<tmpl_var recover.form.hidden>
-<table>
-<tr>
-	<td class="formDescription" valign="top"><tmpl_var recover.form.email.label></td>
-	<td class="tableData"><tmpl_var recover.form.email></td>
-</tr>
-<tr>
-	<td class="formDescription" valign="top"></td>
-	<td class="tableData"><tmpl_var recover.form.submit></td>
-</tr>
-</table>
-<tmpl_var recover.form.footer>
-
-<div class="accountOptions">
-	<ul>
-		<tmpl_if anonymousRegistration.isAllowed>
-			<li><a href="<tmpl_var createAccount.url>"><tmpl_var createAccount.label></a></li>
-		</tmpl_if>
-		<li><a href="<tmpl_var login.url>"><tmpl_var login.label></a></li>
-      	</ul>
-</div>
diff --git a/docs/upgrades/templates-7.0.3/dtree.tmpl b/docs/upgrades/templates-7.0.3/dtree.tmpl
deleted file mode 100644
index e4ef989c4..000000000
--- a/docs/upgrades/templates-7.0.3/dtree.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-#PBtmpl0000000000000130
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<div class="dtree">
-<script type="text/javascript">
-<!--
-	// Path to dtree directory
-	_dtree_url = "^Extras(Navigation/dtree/);";
-
-	d = new dTree('d','^/;');
-	<tmpl_loop page_loop>
-	d.add(
-		'<tmpl_var page.assetId escape=JS>',
-		<tmpl_if __first__>-99<tmpl_else>'<tmpl_var page.parentId escape=JS>'</tmpl_if>,
-		'<tmpl_var page.menuTitle escape=JS>',
-		'<tmpl_var page.url escape=JS>',
-		'<tmpl_var page.synopsis escape=JS>'
-		<tmpl_if page.newWindow>,'_blank'</tmpl_if>
-	);
-	</tmpl_loop>
-	document.write(d);
-//-->
-</script>
-</div>
-~~~
-<link href="^Extras(Navigation/dtree/dtree.css);" type="text/css" rel="stylesheet" />
-<script src="^Extras(Navigation/dtree/dtree.js);" type="text/javascript"></script>
diff --git a/docs/upgrades/templates-7.0.3/events_calendar_event_list.tmpl b/docs/upgrades/templates-7.0.3/events_calendar_event_list.tmpl
deleted file mode 100644
index b01cc5a04..000000000
--- a/docs/upgrades/templates-7.0.3/events_calendar_event_list.tmpl
+++ /dev/null
@@ -1,76 +0,0 @@
-#PBtmpl0000000000000086
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<tmpl_if session.var.adminOn>
-	<p><a href="<tmpl_var addevent.url>"><tmpl_var addevent.label></a></p>
-</tmpl_if>
-
-<tmpl_loop month_loop><tmpl_loop day_loop><tmpl_loop event_loop><tmpl_if isFirstDayOfEvent>
-	<div class="eventsList">
-		<tmpl_unless dateIsSameAsPrevious>
-			<b><tmpl_var start.day.dayOfWeek> <tmpl_var start.month> <tmpl_var start.day><tmpl_unless startEndYearMatch>, <tmpl_var start.year></tmpl_unless><tmpl_unless startEndDayMatch> - <tmpl_unless startEndMonthMatch><tmpl_var end.day.dayOfWeek> <tmpl_var end.month> </tmpl_unless><tmpl_var end.day></tmpl_unless>, <tmpl_var end.year></b>
-		</tmpl_unless>
-		&#160;&#160;&#160;
-		<tmpl_if session.var.adminOn><a href="<tmpl_var url>"></tmpl_if>
-		<i><tmpl_var name></i>
-		<tmpl_if session.var.adminOn></a></tmpl_if>
-		<tmpl_if description> - <tmpl_var description></tmpl_if description>
-	</div>
-</tmpl_if></tmpl_loop></tmpl_loop></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>
-~~~
-<style type="text/css">
-.pagination	{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:100%;
-	text-align:center;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-.pagination a {
-	color:white;
-}
-.fontSettings {
-	font-family:arial;
-	font-size:9pt;
-}
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.eventsList {
-	font-family:arial;
-	font-size:9pt;
-	margin-top:9pt;
-	margin-bottom:9pt;
-}
-.eventsList a {
-	color:#29587E;
-}
-.eventsList b {
-	margin-top:7px;
-	margin-bottom:1px;
-	display:block;
-}
-</style>
diff --git a/docs/upgrades/templates-7.0.3/job.tmpl b/docs/upgrades/templates-7.0.3/job.tmpl
deleted file mode 100644
index 58d739cd8..000000000
--- a/docs/upgrades/templates-7.0.3/job.tmpl
+++ /dev/null
@@ -1,349 +0,0 @@
-#PBtmpl0000000000000098
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<tmpl_if user.isModerator>
-	<div style="float: right; font-size: 11px; border: 1px solid #cccccc; padding: 2px; margin: 2px;">
-		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-	</div>
-</tmpl_if>	
-
-<tmpl_if content>
-	<b>Job Description</b><br />
-	<p><tmpl_var content></p>
-</tmpl_if>
-
-<tmpl_if userDefined3>
-	<b>Job Requirements</b><br />
-	<p><tmpl_var userDefined3></p>
-</tmpl_if>
-
-<table width="100%">
-<tr>
-	<td class="tableHeader">Date Posted</td>
-	<td class="tableData"><tmpl_var dateSubmitted.human>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Location</td>
-	<td class="tableData"><tmpl_var userDefined2>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Compensation</td>
-	<td class="tableData"><tmpl_var userDefined1>&#160;</td>
-</tr>
-<tr>
-	<td class="tableHeader">Views</td>
-	<td class="tableData"><tmpl_var views>&#160;</td>
-</tr>
-</table>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>">
-				<tmpl_if isImage>
-					<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-				<tmpl_else>
-					<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-				</tmpl_if>
-				</a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<tmpl_if repliesAllowed>
-
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="id<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<div style="float: left; width: 50%">
-							<b><tmpl_var user.label>:</b> 
-								<tmpl_if user.isVisitor>
-									<tmpl_var username>
-								<tmpl_else>
-									<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-								</tmpl_if>
-								<br />
-							<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-						</div>	
-						<div>
-							<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-							<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>
-								<br />
-								<tmpl_if user.isPoster>
-									<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-								</tmpl_if>	
-						</div>	
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;">
-								<a href="<tmpl_var url>">
-								<tmpl_if isImage>
-									<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-								<tmpl_else>
-									<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-								</tmpl_if>
-								</a>							
-							</div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="id<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-							<div style="float: left; width: 50%">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-							</div>	
-							<div>
-								<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-									<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-									</tmpl_unless>
-									<br />
-									<tmpl_if user.isPoster>
-										<b><tmpl_var status.label>:</b> <tmpl_var status><br />
-									</tmpl_if>	
-							</div>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;">
-									<a href="<tmpl_var url>">
-									<tmpl_if isImage>
-										<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-									<tmpl_else>
-										<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-									</tmpl_if>
-									</a>								
-								</div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>			
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-	font-size:9pt;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.postControls
-{
-	background:#676767;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-.postControls a:link, .postControls a:visited
-{
-	color:white;
-	text-decoration:underline;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-family:arial;
-	font-size:9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-}
-.threadData {
-	font-family:arial;
-	font-size:9pt;
-	padding: 3px;
-}
-
-.tableHeader
-{
-	width:20%;
-	background-color:#DADADA;
-	font-family:arial;
-	font-size:9pt;	
-}
-
-.tableData
-{
-	width:80%;
-	border:solid #DADADA 1px;
-	font-family:arial;
-	font-size:9pt;	
-}
-</style>
diff --git a/docs/upgrades/templates-7.0.3/make_page_printable.tmpl b/docs/upgrades/templates-7.0.3/make_page_printable.tmpl
deleted file mode 100644
index ed2929e9e..000000000
--- a/docs/upgrades/templates-7.0.3/make_page_printable.tmpl
+++ /dev/null
@@ -1,93 +0,0 @@
-#PBtmpl0000000000000111
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-<title>^Page(title); - <tmpl_var session.setting.companyName></title>
-<link rel="icon" href="^Extras(favicon.png);" type="image/png" />
-<link rel="shortcut icon" href="^Extras(favicon.ico);" />
-<tmpl_var head.tags>
-<style type="text/css">
-.content {
-	background-color: #ffffff;
-	color: #000000;
-	font-family: helvetica, arial;
-	font-size: 10pt;
-	padding: 10pt;
-}
-h1 {
-	font-family: helvetica, arial;
-	font-size: 16pt;
-}
-a {
-	color: #EF4200;
-}
-.pagination {
-	font-family: helvetica, arial;
-	font-size: 8pt;
-	text-align: center;
-}
-.formDescription {
-	font-family: helvetica, arial;
-	font-size: 10pt;
-	font-weight: bold;
-}
-.formSubtext {
-	font-family: helvetica, arial;
-	font-size: 8pt;
-}
-.highlight {
-	background-color: #dddddd;
-}
-.tableMenu {
-	background-color: #cccccc;
-	font-size: 8pt;
-	font-family: Helvetica, Arial;
-}
-.tableMenu a {
-	text-decoration: none;
-}
-.tableHeader {
-	background-color: #cccccc;
-	font-size: 10pt;
-	font-family: Helvetica, Arial;
-}
-.tableData {
-	font-size: 10pt;
-	font-family: Helvetica, Arial;
-}
-
-.pollAnswer {
-	font-family: Helvetica, Arial;
-	font-size: 8pt;
-}
-
-.pollColor {
-	background-color: #444444;
-}
-
-.pollQuestion {
-	font-face: Helvetica, Arial;
-	font-weight: bold;
-}
-
-.faqQuestion {
-	font-size: 12pt;
-	font-weight: bold;
-	color: #000000;
-}
-</style>
-</head>
-<body onload="window.print()">
-
-^AdminBar("");
-
-<div style="text-align:center;"><a href="^PageUrl;"><img src="^Extras(plainblack.gif);" style="border-style:none;" alt="plainblack" /></a></div>
-
-<div>
-	<tmpl_var body.content>
-</div>
-
-<div style="text-align:center;">&copy; 2001-2004 Plain Black LLC</div>
-
-</body>
-</html>
diff --git a/docs/upgrades/templates-7.0.3/matrix_default_detailed_listing.tmpl b/docs/upgrades/templates-7.0.3/matrix_default_detailed_listing.tmpl
deleted file mode 100644
index 075ec93c6..000000000
--- a/docs/upgrades/templates-7.0.3/matrix_default_detailed_listing.tmpl
+++ /dev/null
@@ -1,100 +0,0 @@
-#matrixtmpl000000000003
-<h2><tmpl_var productName></h2>
-
-
-<table class="content" border="0" cellspacing="5">
-<tr><td valign="top">
-		<table class="content">
-		<tr><td><b>Web Site</b></td><td><a onclick="window.open('<tmpl_var productUrl.click>')" href="#"><tmpl_var productUrl></a></td></tr>
-		<tr><td><b>Version Number</b></td><td><tmpl_var versionNumber></td></tr>
-		<tr><td><b>Manufacturer</b></td><td><a onclick="window.open('<tmpl_var manufacturerUrl.click>')" href="#"><tmpl_var manufacturerName></a></td></tr>
-		<tr><td><b>Last Updated</b></td><td><tmpl_var lastUpdated.date></td></tr>
-		<tr><td><b>Clicks</b></td><td><tmpl_var clicks></td></tr>
-		<tr><td><b>Views</b></td><td><tmpl_var views></td></tr>
-		<tr><td><b>Compares</b></td><td><tmpl_var compares></td></tr>
-		</table>
-	</td>
-	<td valign="top" style="background-color:silver;">&nbsp;</td>
-	<td valign="top">
-		<tmpl_if description>
-			<b>Description</b><br />
-			<tmpl_var description><br /><br />
-		</tmpl_if>
-
-		<b>Contact Maintainer</b><br />
-		<tmpl_if email.wasSent>
-			<div style="color: green;">Message sent.<br /></div>
-		</tmpl_if>
-		<tmpl_var email.form>
-	</td>
-	<td valign="top" style="background-color:silver;">&nbsp;</td>
-	<td valign="top">
-		<tmpl_var ratings>
-	</td>
-</tr>
-</table>
-
-<p />
-
-<table width="100%"  class="content">
-<tr>
-	<td valign="top" style="width:50%">
-		<span class="category">Features</span>
-		<table class="content" width="180">
-
-		<tmpl_loop features_loop>
-		<tr<tmpl_if __ODD__> class="odd"<tmpl_else> class="even"</tmpl_if>>
-			<td onmouseover="return escape('<tmpl_var description>')"><tmpl_var label></td>
-			<td><tmpl_var value></td>
-		</tr>
-		</tmpl_loop>
-		<tr>
-			<td>&#160;</td>
-			<td>&#160;</td>
-		</tr>
-		</table>
-		
-		<p />
-	</td>
-	<td valign="top" style="width:50%;">
-		<span class="category">Benefits</span>
-		<table class="content" width="180">
-
-		<tmpl_loop benefits_loop>
-		<tr<tmpl_if __ODD__> class="odd"<tmpl_else> class="even"</tmpl_if>>
-			<td onmouseover="return escape('<tmpl_var description>')"><tmpl_var label></td>
-			<td class="<tmpl_var class>"><tmpl_var value></td>
-		</tr>
-		</tmpl_loop>
-		<tr>
-			<td>&#160;</td>
-			<td>&#160;</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-
-<p />
-
-<tmpl_var discussion>
-
-<tmpl_if user.canEdit>
-  <br /> <hr /><a href="<tmpl_var edit.url>">Edit this listing.</a> <br />
-</tmpl_if>
-<tmpl_if user.canApprove>
- <tmpl_if isPending>
-   <a href="<tmpl_var approve.url>">Approve this listing.</a><br />
- </tmpl_if>
-   <a href="<tmpl_var delete.url>">Delete this listing.</a><br />
-  
-</tmpl_if>
-~~~
-<style type="text/css">
-.ratingForm {
- font-size: 9px;
-}
-.statBox {
-	width:100%;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-7.0.3/multisearch_default_display.tmpl b/docs/upgrades/templates-7.0.3/multisearch_default_display.tmpl
deleted file mode 100644
index 5dee9ec8f..000000000
--- a/docs/upgrades/templates-7.0.3/multisearch_default_display.tmpl
+++ /dev/null
@@ -1,57 +0,0 @@
-#MultiSearchTmpl0000001
-<a name="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>
-<script type="text/javascript">
-function domultisearch() {
-	var sf = document.getElementById("multisearchform");
-	var submitto = sf.sengines.options[sf.sengines.selectedIndex].value + escape(sf.searchterms.value);
-	window.open(submitto);
-	return false;
-}
-</script>
-<div style="width:100%">
-<form id="multisearchform" onsubmit="return domultisearch();" action="">
-<table cellpadding="2" cellspacing="0" class="multiSearch" border="0">
-<tr>
-	<td align="right">Search:</td>
-	<td>
-		<select name="sengines">
-			<option value="http://www.google.com/search?q=" selected="selected">Google</option>
-			<option value="http://news.google.com/news?q=">Google News</option>
-			<option value="http://www.flickr.com/photos/tags/">Flickr Photos</option>
-			<option value="http://www.digg.com/search?submit=Submit&amp;search=">Digg.com</option>
-			<option value="http://www.altavista.com/web/results?q=">Alta Vista</option>
-			<option value="http://search.yahoo.com/search?p=">Yahoo!</option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td align="right">For:</td>
-	<td><input type="text" name="searchterms" />&#160;<input type="submit" name="SearchSubmit" value="Search" /></td>
-</tr>
-</table>
-</form>
-</div>
-~~~
-<style type="text/css">
-h2 {
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-.multiSearch {
-	background-color:#DADADA;
-	border:solid gray 1px;	
-}
-</style>
diff --git a/docs/upgrades/templates-7.0.3/request_tracker_post.tmpl b/docs/upgrades/templates-7.0.3/request_tracker_post.tmpl
deleted file mode 100644
index 1a6ea2925..000000000
--- a/docs/upgrades/templates-7.0.3/request_tracker_post.tmpl
+++ /dev/null
@@ -1,384 +0,0 @@
-#PBtmpl0000000000000209
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<h2><tmpl_var title></h2>
-
-<div class="defaultSubmissionDetails">
-<tmpl_if avatar.url>
-<div style="width: 100%; text-align: center;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>	
-	<b><tmpl_var user.label>:</b> 
-		<tmpl_if user.isVisitor>
-			<tmpl_var username>
-		<tmpl_else>
-			<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-		</tmpl_if>
-		<br />
-	<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-	<b><tmpl_var severity.label>:</b> <tmpl_var userDefined1><br />
-	<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-	<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-		<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-		</tmpl_unless>
-		<br />
-	<tmpl_if user.isModerator>
-		<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> &nbsp; &nbsp; [ <a href="<tmpl_var unarchive.url>"><tmpl_var open.label></a> <tmpl_else> <tmpl_var open.label> &nbsp; &nbsp; [ <a href="<tmpl_var archive.url>"><tmpl_var close.label></a></tmpl_if> ]<br />
-	<tmpl_else>	
-		<tmpl_if user.isPoster>
-			<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> <tmpl_else> <tmpl_var open.label></tmpl_if><br />
-		</tmpl_if>	
-	</tmpl_if>	
-<tmpl_if karmaIsEnabled>
-	<b><tmpl_var karmaRank.label>:</b> <tmpl_var karmaRank><br />
-<b><tmpl_var transferkarma.label>:</b>
-<tmpl_var transfer.karma.form>
-</tmpl_if>	
-</div>
-
-<div class="collaborationThreadContent">
-	<tmpl_var content>
-</div>
-
-<tmpl_if attachment_loop>
-	<br />
-		<tmpl_loop attachment_loop>
-			<div style="float: left; padding: 5px;">
-				<a href="<tmpl_var url>">
-					<tmpl_if isImage>
-						<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-					<tmpl_else>
-						<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-					</tmpl_if>
-				</a>
-			</div>
-		</tmpl_loop>
-		<div style="clear: both;"></div>
-	<br />
-</tmpl_if>
-
-<tmpl_unless isLocked>
-	<div class="postControls">
-		<tmpl_if user.canReply>
-			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if user.canEdit>
-			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-			&bull;
-			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-		</tmpl_if>
-	</div>
-</tmpl_unless>
-
-<div style="clear:both;"></div>
-
-<tmpl_if repliesAllowed>
-	<div style="float: left; width: 70%">
-		<h2><tmpl_var replies.label></h2>
-	</div>
-	<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-	</div>
-	<div style="clear: both;"></div>
-	
-	<tmpl_if layout.isFlat>
-	<!-- begin flat layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-					<a name="id<tmpl_var assetId>"></a>
-					<div class="postSubject">
-						<tmpl_var title>
-					</div>
-					<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-<tmpl_if avatar.url>
-<td style="padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</td>
-</tmpl_if>
-							<td style="padding-right: 25px;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>	
-								<br />									
-							</td>
-						</tr>
-						</table>
-					</div>
-					<div class="postMessage">
-						<tmpl_var content>
-						<tmpl_loop attachment_loop>
-							<div style="float: left; padding: 5px;">
-								<a href="<tmpl_var url>">
-									<tmpl_if isImage>
-										<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-									<tmpl_else>
-										<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-									</tmpl_if>
-								</a>
-							</div>
-						</tmpl_loop>
-						<div style="clear: both;"></div>
-					</div>
-					<tmpl_unless isLocked>
-						<div class="postControls">
-							<tmpl_if user.canReply>
-								<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-								&bull;
-							</tmpl_if>
-							<tmpl_if user.canEdit>
-								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-								&bull;
-								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-							</tmpl_if>
-						</div>
-					</tmpl_unless>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end flat layout -->
-	</tmpl_if>
-	
-	<tmpl_if layout.isNested>
-	<!-- begin nested layout -->
-		<tmpl_loop post_loop>
-			<tmpl_unless isThreadRoot>
-				<div style="margin-left: <tmpl_var depthX10>px;">
-					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-						<a name="id<tmpl_var assetId>"></a>
-						<div class="postSubject">
-							<tmpl_var title>
-						</div>
-						<div class="postData">
-						<table cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr>
-<tmpl_if avatar.url>
-<td style="padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</td>
-</tmpl_if>
-							<td style="padding-right: 25px;text-align:left;">
-								<b><tmpl_var user.label>:</b> 
-									<tmpl_if user.isVisitor>
-										<tmpl_var username>
-									<tmpl_else>
-										<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-									</tmpl_if>
-									<br />
-								<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human>
-							</td>
-							<td style="text-align:left;">
-								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-								<tmpl_unless hasRated>
-								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-								</tmpl_unless>	
-								<br />
-							</td>
-						</tr>
-						</table>	
-						</div>
-						<div class="postMessage">
-							<tmpl_var content>
-							<tmpl_loop attachment_loop>
-								<div style="float: left; padding: 5px;">
-									<a href="<tmpl_var url>">
-										<tmpl_if isImage>
-											<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-										<tmpl_else>
-											<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-										</tmpl_if>
-									</a>
-								</div>
-							</tmpl_loop>
-							<div style="clear: both;"></div>
-						</div>
-						<tmpl_unless isLocked>
-							<div class="postControls">
-								<tmpl_if user.canReply>
-									<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
-									&bull;
-								</tmpl_if>
-								<tmpl_if user.canEdit>
-									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
-									&bull;
-									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-								</tmpl_if>
-							</div>
-						</tmpl_unless>
-					</div>
-				</div>
-			</tmpl_unless>
-		</tmpl_loop>
-	<!-- end nested layout -->
-	</tmpl_if>
-	
-	<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination" style="margin-top: 20px;">
-			[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-		</div>
-	</tmpl_if>
-</tmpl_if>	
-
-<div class="postControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
-		&bull;
-	</tmpl_if>	
-	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>
-	
-	<tmpl_if next.url>
-		&bull;
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a>				
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		&bull;
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
-			&bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
-			&bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
-			&bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
-~~~
-<style type="text/css">
-.defaultSubmissionDetails
-{
-	float: right; 		
-	padding: 2px; 
-	margin: 2px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:20px;
-}
-
-.defaultSubmissionDetails a
-{
-	color:#29587E;
-}
-
-.postBorder {
-	border: 1px solid #cccccc;
-	margin-bottom: 10px;
-}
-.postBorderCurrent {
-	border: 3px dotted black;
-	margin-bottom: 10px;
-}
-.postSubject {
-	border-bottom: 1px solid #cccccc;
-	font-weight: bold;
-	padding: 3px;
-	font-family:arial;
-}
-.postData {
-	border-bottom: 1px solid #cccccc;
-	background-color: #eeeeee;
-	padding: 3px;
-}
-.postData td {
-	font-size: 9pt;
-	color: black;
-	font-family:arial;
-}
-.postControls {
-	border-top: 1px solid #cccccc;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-	clear:both;
-	width:100%;
-display:block;
-	-moz-box-sizing:border-box;
-}
-.postMessage {
-	padding: 3px;
-}
-.currentThread {
-	background-color: #eeeeee;
-}
-.threadHead {
-	font-weight: bold;
-	border-bottom: 1px solid #cccccc;
-	font-size: 9pt;
-	background-color: #eeeeee;
-	color: black;
-	padding: 3px;
-	font-family:arial;
-}
-.threadData {
-	font-size: 11px;
-	padding: 3px;
-	font-family:arial;
-}
-
-.postControls
-{
-	background:#676767;
-	display:block;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-top: 1px;	
-}
-.postControls a:link, .postControls a:visited
-{
-	color:white;
-	text-decoration:underline;
-}
-.postControls a:hover {
-	text-decoration:none;
-}
-.collaborationThreadContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-</style>
diff --git a/docs/upgrades/templates-7.0.3/sqlform_search.tmpl b/docs/upgrades/templates-7.0.3/sqlform_search.tmpl
deleted file mode 100644
index 27b2cf40c..000000000
--- a/docs/upgrades/templates-7.0.3/sqlform_search.tmpl
+++ /dev/null
@@ -1,81 +0,0 @@
-#SQLFormSearchTmpl00001
-<a name="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<div class="SQLForm-contentBox">
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_var managementLinks>
-
-<h2>Search records</h2>
-<a href="<tmpl_var superSearch.url>"><tmpl_var superSearch.label></a><br />
-
-<tmpl_if errorOccurred>
-Some error(s) occurred:
-<ul>
-	<tmpl_loop errorLoop>
-	<li><tmpl_var error.message></li>
-	</tmpl_loop>
-</ul>
-</tmpl_if>
-
-<tmpl_var searchForm>
-
-<tmpl_if showFieldsDefined>
-<tmpl_var searchResults.header>
-<tmpl_var searchResults.actionButtons>
-<table border="0">
-	<tr>
-		<th></th>
-		<tmpl_if showMetaData>
-		<th>Last update</th>
-		<th>Last update by</th>
-		</tmpl_if>
-	<tmpl_loop headerLoop>
-		<th <tmpl_if
-header.sort.onThis>color="red"</tmpl_if>>
-			<a href="<tmpl_var header.sort.url>">
-			<tmpl_var header.title> 
-			<tmpl_if header.sort.onThis><tmpl_if header.sort.ascending>(asc)<tmpl_else>(desc)</tmpl_if></tmpl_if></a></th>
-	</tmpl_loop>
-	</tr>
-	<tmpl_loop searchResults.recordLoop>
-	<tr>
-		<td><tmpl_var record.controls></td>
-		<tmpl_if showMetaData>
-		<td><tmpl_var record.updateDate></td>
-		<td><tmpl_var record.updatedBy></td>
-		</tmpl_if>
-		<tmpl_loop record.valueLoop>
-		<td>
-		<tmpl_if record.value.isFile>
-			<tmpl_if record.value>
-				<a href="<tmpl_var record.value.downloadUrl>">
-				<tmpl_if record.value.isImage>
-					<img width="100" src="<tmpl_var record.value.downloadUrl>" alt="<tmpl_var record.value.downloadUrl>" />
-				<tmpl_else>
-					Click here for file
-				</tmpl_if>
-				</a>
-			</tmpl_if>
-		<tmpl_else>
-			<tmpl_var record.value>
-		</tmpl_if>
-		</td>
-		</tmpl_loop>
-	</tr>
-	</tmpl_loop>
-</table>
-<tmpl_var searchResults.actionButtons>
-<tmpl_var searchResults.footer>
-<tmpl_else>
-No fields are defined to be shown in the search results.
-</tmpl_if>
-
-</div>
diff --git a/docs/upgrades/templates-7.0.3/stock_data_default_view.tmpl b/docs/upgrades/templates-7.0.3/stock_data_default_view.tmpl
deleted file mode 100644
index 9675f51f6..000000000
--- a/docs/upgrades/templates-7.0.3/stock_data_default_view.tmpl
+++ /dev/null
@@ -1,94 +0,0 @@
-#StockDataTMPL000000001
-<a name="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>
-
-<table cellpadding="0" cellspacing="0" border="0" class="qmmt_main" width="100%">
-   <tr>
-      <td colspan="3" style="text-align: left">  
-	     <div class="qmmt_header_bar" style="padding-top: 1px; padding-bottom: 1px; border-bottom-width: 1px;">
-		    <table cellpadding="0" cellspacing="0" border="0" width="100%">   
-			  <tr>
-			     <td class="qmmt_header_text">Stock Watch</td>
-				 <td class="qmmt_header_text" style="text-align: right; padding-right: 3px; font-weight: normal;">
-				    <div id="qm_textChange_7310">
-					   <span class="qmmt_header_text" style="font-weight:normal;"><b>Last Update: </b> <tmpl_var lastUpdate.default> EDT</span></div>
-					      <script type="text/javascript">
-//<![CDATA[
-
-						     function qm_UpdateText_7310(phase){    
-							   switch (phase)    {        
-							      case 1: document.getElementById('qm_textChange_7310').innerHTML = '<span class="qmmt_header_text" style="font-weight:normal;">delayed 20 minutes</span>'; 
-                                   setTimeout("qm_UpdateText_7310(2)", 5000); 
-								   break;        
-								  case 2: document.getElementById('qm_textChange_7310').innerHTML = '<span class="qmmt_header_text" style="font-weight:normal;"><b>Last Update:&nbsp;</b> <tmpl_var lastUpdate.default> EDT</span>'; 
-                                   setTimeout("qm_UpdateText_7310(3)", 5000); 
-								   break;        
-								  case 3: document.getElementById('qm_textChange_7310').innerHTML = '<a href="http://www.quotemedia.com/" style="text-decoration:none;"><span class="qmmt_header_text" style="font-weight:normal;">Yahoo Finance</span></a>';
-                                   setTimeout("qm_UpdateText_7310(1)", 5000); 
-								   break;        
-								}        
-							 }
-							 qm_UpdateText_7310(2);
-//]]>
-						 </script> 
-				  </td>       
-				</tr>  
-		     </table>  
-	      </div>  
-	   </td> 
-	</tr>  
-	<tr>  
-	   <td>       
-	      <script type="text/javascript">
-//<![CDATA[
-		     function openDetail_2961(symbol) {     
-			    var w = 670;   
-				var h = 286;   
-				var winl = (screen.width - w) / 2;   
-				var wint = (screen.height - h) / 2;   
-			    var winprops ='height='+h+',width='+w+',top='+wint+',left='+winl+',toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=0,resizable=1';   
-				win = window.open("<tmpl_var stock.display.url>" + escape(symbol), "DetailedQuote", winprops);
-				if (parseInt(navigator.appVersion) >= 4) {       
-				   win.window.focus();   
-				}   
-		      }
-//]]>
-		   </script>    
-		   <table cellpadding="0" cellspacing="0" style="padding: 2px;" width="100%">   
-		      <tr class="qmmt_main">
-			     <td class="qmmt_text" style="font-weight: bold; text-align: left; padding-left: 3px;white-space:nowrap;"> Name </td>        
-				 <td class="qmmt_text" style="font-weight: bold; text-align: left; padding-left: 3px; white-space:nowrap;width:8%;">Symbol</td>    
-				 <td class="qmmt_text" style="font-weight: bold; text-align: right; white-space:nowrap;width:9%;">Last</td>
-				 <td class="qmmt_text" style="font-weight: bold; text-align: center; white-space:nowrap;width:4%">Tick</td>        
-				 <td class="qmmt_text" style="font-weight: bold; text-align: right; white-space:nowrap; width:7%;">Chg</td>         
-	          </tr>
-			  <tmpl_loop stocks.loop>
-			     <tr class='<tmpl_if __ODD__>qmmt_cycle<tmpl_else>qmmt_main</tmpl_if>'>            
-			        <td class="qmmt_text" style="padding-left: 3px;white-space:nowrap;"><tmpl_var stocks.name></td>
-				    <td class="qmmt_text" style="text-align: left; padding-left: 3px;white-space:nowrap;">
-				       <a class="qmmt" style="text-decoration: none;" href="javascript:openDetail_2961('<tmpl_var stocks.symbol>')"><tmpl_var stocks.symbol></a>
-			        </td>        
-				    <td class="qmmt_text" style="text-align: right;white-space:nowrap;"><tmpl_var stocks.last></td>
-				    <td class="qmmt_text" style="text-align: center;white-space:nowrap;" align="right">
-					   <img src="<tmpl_var extrasFolder>/<tmpl_var stocks.net.icon>" alt="" />            
-				    </td>
-				    <td class="qmmt_text<tmpl_if stocks.net.isUp>_up<tmpl_else><tmpl_if stocks.net.isDown>_down</tmpl_if></tmpl_if>" style="text-align: right;whitespace:nowrap;"><tmpl_var stocks.net></td>
-			     </tr>          
-			  </tmpl_loop>  
-			</table>      
-	     </td> 
-	  </tr>
-  </table>
-~~~
-<link rel="stylesheet" type="text/css" href="<tmpl_var extrasFolder>/tools.css" />
diff --git a/docs/upgrades/templates-7.0.3/stockdata_default_display.tmpl b/docs/upgrades/templates-7.0.3/stockdata_default_display.tmpl
deleted file mode 100644
index 41ddccbb8..000000000
--- a/docs/upgrades/templates-7.0.3/stockdata_default_display.tmpl
+++ /dev/null
@@ -1,213 +0,0 @@
-#StockDataTMPL000000002
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-<title></title>
-<style type="text/css">
-.qmmt_tab
-{
-	background-color: #eeeeee;
-	border-top-color: #cccccc;
-	border-right: 1px solid #cccccc;
-}
-.qmmt_tabactive
-{
-	border-right: 1px solid #cccccc;
-}
-body {
-	color:#000;
-	background-color:#f1f1f1;
-}
-a:link, a:visited {
-	color:#0000cc;
-}
-a:hover {
-	color:#FF0000;
-}
-</style>
-<link rel="stylesheet" type="text/css" href="<tmpl_var extrasFolder>/tools.css" />
-</head>
-<body>
-<div><a name="id<tmpl_var assetId>"></a></div>
-<script type="text/javascript">
-//<![CDATA[
-   var symbol = "<tmpl_var stocks.symbol>";
-   function isIE() {
-      var ua = navigator.userAgent.toLowerCase();
-	  var isIE = ( (ua.indexOf("msie") != -1) && (ua.indexOf("opera") == -1) && (ua.indexOf("webtv") == -1) );
-	  return (isIE);
-   }
-
-   function enableTab(obj, scale){
-      for (i=0; i < 7; i++)    {
-	     document.getElementById('qm_ch_tab' + i + '_9350').className = (i == obj) ? 'qmmt_tabactive' : 'qmmt_tab';
-		 document.getElementById('qm_ch_tab' + i + '_9350').style.cursor = (i == obj) ? 'default' : (isIE()) ? 'hand': 'pointer';
-		 document.getElementById('qm_ch_tab' + i + '_9350').style.borderTop = (i == obj) ? '0px' : '1px solid';
-	  }
-	  document.getElementById('chartimg').src = "http://ichart.finance.yahoo.com/z?s=" + symbol + "&amp;t=" + scale + "&amp;q=l&amp;l=off&amp;z=s&amp;p=s";
-   }
-//]]>
-</script>
-
-<table cellpadding="0" cellspacing="0" border="0" class="qmmt_main" width="650">
-  <tr>
-     <td style="text-align: center;">
-	    <div class="qmmt_header_bar" style="padding-bottom: 1px; border-bottom-width: 1px; ">
-		   <table cellpadding="0" cellspacing="0" border="0" width="100%">
-		      <tr>
-			     <td><span class="qmmt_header_text" style="padding-left:5px;"><tmpl_var stocks.name> (<tmpl_var stocks.symbol>)</span></td>
-				 <td align="right" style="padding-right:3px;">
-				    <span class="qmmt_header_text" style="text-align: right; font-weight:normal;">
-					<div style="white-space:nowrap;" id="qm_textChange_5920">1:23 PM EDT</div>
-					<script type="text/javascript">
-//<![CDATA[
-					   function qm_UpdateText_5920(phase){
-					      switch (phase)    {
-						     case 1:
-							    document.getElementById('qm_textChange_5920').innerHTML = '<span class="qmmt_header_text" style="font-weight:normal;">Delayed</span>';
-                                setTimeout("qm_UpdateText_5920(2)", 5000);
-								break;
-						     case 2:
-							    document.getElementById('qm_textChange_5920').innerHTML = '<span class="qmmt_header_text" style="font-weight:normal;">1:23 PM EDT</span>';
-                                setTimeout("qm_UpdateText_5920(3)", 5000);
-								break;
-							 case 3:
-							    document.getElementById('qm_textChange_5920').innerHTML = '<a href="http://finance.yahoo.com/" style="text-decoration:none;"><span class="qmmt_header_text" style="font-weight:normal;">Yahoo Finance</span></a>';
-                                 setTimeout("qm_UpdateText_5920(1)", 5000);
-								 break;
-						  }
-					   }
-					   qm_UpdateText_5920(2);
-//]]>
-				    </script>
-					</span>
-				 </td>
-			  </tr>
-		   </table>
-		</div>
-     </td>
-  </tr>
-  <tr>
-     <td style="text-align: center;">
-	    <table cellpadding="2" cellspacing="0" border="0" width="100%">
-		   <tr>
-		      <td style="text-align: center;width:40%">
-			     <img id="chartimg" style="width:350px;height:205px;vertical-align:center;" src="http://ichart.finance.yahoo.com/z?s=<tmpl_var stocks.symbol>&amp;t=1d&amp;q=l&amp;l=off&amp;z=s&amp;p=s" alt="chart" />
-                     <table cellpadding="0" cellspacing="0" border="0" width="100%">
-					    <tr>
-						   <td id="qm_ch_tab0_9350" class="qmmt_tabactive" onclick="enableTab('0', '1d')" style="cursor: default; border-left: 0px; border-bottom: 0px; border-top: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">Today</td>
-                           <td id="qm_ch_tab1_9350" class="qmmt_tab" onclick="enableTab('1', '5d')" style="cursor: default; border-bottom: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">5d</td>
-                           <td id="qm_ch_tab2_9350" class="qmmt_tab" onclick="enableTab('2', '1m')" style="cursor: default; border-bottom: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">1m</td>
-                           <td id="qm_ch_tab3_9350" class="qmmt_tab" onclick="enableTab('3', '3m')" style="cursor: default; border-bottom: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">3m</td>
-                           <td id="qm_ch_tab4_9350" class="qmmt_tab" onclick="enableTab('4', '1y')" style="cursor: default; border-bottom: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">1y</td>
-                           <td id="qm_ch_tab5_9350" class="qmmt_tab" onclick="enableTab('5', '5y')" style="cursor: default; border-bottom: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">5y</td>
-						   <td id="qm_ch_tab6_9350" class="qmmt_tab" onclick="enableTab('6', 'my')" style="cursor: default; border-right: 0px; border-bottom: 0px; padding-top:1px; padding-bottom:1px; font-weight: normal;width: 14%;">20y</td>
-                        </tr>
-					 </table>
-			      </td>
-				  <td align="center" style="width:30%">
-				     <table cellpadding="2" cellspacing="0" border="0" width="95%">
-					    <tr class="qmmt_main">
-						   <td class="qmmt_text">Last Price</td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.last></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Market Cap </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.cap></td>
-						</tr>
-						<tr class="qmmt_main"><td class="qmmt_text"> Change </td>
-						   <td class="qmmt_text<tmpl_if stocks.net.isUp>_up<tmpl_else><tmpl_if stocks.net.isDown>_down</tmpl_if></tmpl_if>" style="text-align: right; font-weight: bold;">
-						      <img style="vertical-align:center;" src='<tmpl_var extrasFolder>/<tmpl_var stocks.net.icon>' alt="" /> <tmpl_var stocks.net>
-						   </td>
-                        </tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Open </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.open></td>
-						</tr>
-						<tr class="qmmt_main">
-						   <td class="qmmt_text"> Day High </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.high></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text">Bid</td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.bid></td>
-						</tr>
-						<tr class="qmmt_main">
-						   <td class="qmmt_text"> 52 Wk High </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.year_high></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> E.P.S. </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.eps></td>
-						</tr>
-						<tr class="qmmt_main">
-						   <td class="qmmt_text"> Ex-Div Date </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.ex_div></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Yield </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.yield></td>
-						</tr>
-				     </table>
-				  </td>
-				  <td align="center" style="width:30%;">
-				     <table cellpadding="2" cellspacing="0" border="0" width="95%">
-					    <tr class="qmmt_main">
-						   <td class="qmmt_text"> Last Trade </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var lastUpdate.us></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Volume </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.volume.millions> m</td>
-						</tr>
-						<tr class="qmmt_main">
-						   <td class="qmmt_text">% Change </td>
-						   <td class="qmmt_text<tmpl_if stocks.net.isUp>_up<tmpl_else><tmpl_if stocks.net.isDown>_down</tmpl_if></tmpl_if>"  style="text-align: right; font-weight: bold;"><tmpl_var stocks.p_change>%</td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Prev Close </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.close></td>
-						</tr>
-						<tr class="qmmt_main">
-						   <td class="qmmt_text"> Day Low </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.low></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Ask </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.ask></td>
-						</tr>
-						<tr class="qmmt_main">
-						   <td class="qmmt_text"> 52 Wk Low </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.year_low></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> P/E Ratio </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.pe></td>
-						</tr>
-						<tr class="qmmt_main">
-						   <td class="qmmt_text"> Dividend </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.div></td>
-						</tr>
-						<tr class="qmmt_cycle">
-						   <td class="qmmt_text"> Exchange </td>
-						   <td class="qmmt_text" style="text-align: right; font-weight: bold;"><tmpl_var stocks.exchange></td>
-						</tr>
-				     </table>
-				  </td>
-			   </tr>
-			</table>
-	     </td>
-	  </tr>
-   </table>
-
-<div style="text-align:center;">
-<table cellpadding="0" cellspacing="0" border="0" width="650">
-<tr>
-   <td>
-      <div class="qmmt_text" style="text-align:right;"><br /><a href="javascript:window.close()" style="color:#0000cc">CLOSE</a></div>
-   </td>
-</tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/docs/upgrades/templates-7.0.3/subscription_code_redemption.tmpl b/docs/upgrades/templates-7.0.3/subscription_code_redemption.tmpl
deleted file mode 100644
index c38b1e4dd..000000000
--- a/docs/upgrades/templates-7.0.3/subscription_code_redemption.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-#PBtmpl0000000000000053
-<tmpl_if batchDescription>
-Batch: <tmpl_var batchDescription>
-</tmpl_if>
-
-<tmpl_var message><br />
-<tmpl_var codeForm>
diff --git a/docs/upgrades/templates-7.0.3/subscriptionitem_default_template.tmpl b/docs/upgrades/templates-7.0.3/subscriptionitem_default_template.tmpl
deleted file mode 100644
index 892825f75..000000000
--- a/docs/upgrades/templates-7.0.3/subscriptionitem_default_template.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-#PBtmpl0000000000000046
-<h2><tmpl_var name></h2>
-<tmpl_var description><br />
-<br />
-<br />
-$ <tmpl_var price><br />
-<a href="<tmpl_var url>">Subscribe now</a><br />
diff --git a/docs/upgrades/templates-7.0.3/table_default_page.tmpl b/docs/upgrades/templates-7.0.3/table_default_page.tmpl
deleted file mode 100644
index 7849fee51..000000000
--- a/docs/upgrades/templates-7.0.3/table_default_page.tmpl
+++ /dev/null
@@ -1,50 +0,0 @@
-#PBtmpl000000000table54
-#create
-#title:Default Page (Table)
-#menuTitle:Default Page (Table)
-#url:default_page_table
-#namespace:Layout
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position1" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position1_loop>
-	<tmpl_if showAdmin>
-		<tr id="td<tmpl_var id>"><td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<table border="0">
-	<tr>
-		<td class="content"><tmpl_var dragger.icon><tmpl_var content></td>
-	</tr>
-	</table>
-
-	<tmpl_if showAdmin>
-		</div></td></tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-	</tbody></table>
-</tmpl_if>
-</div>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-	<tmpl_var dragger.init>
-</tmpl_if>
diff --git a/docs/upgrades/templates-7.0.3/table_one_over_three.tmpl b/docs/upgrades/templates-7.0.3/table_one_over_three.tmpl
deleted file mode 100644
index 0bb9ee783..000000000
--- a/docs/upgrades/templates-7.0.3/table_one_over_three.tmpl
+++ /dev/null
@@ -1,153 +0,0 @@
-#PBtmpl00000000table109
-#create
-#title:One Over Three (Table)
-#menuTitle:One Over Three (Table)
-#url:one_over_three_table
-#namespace:Layout
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if showAdmin>
-<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-  <h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-  <p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellpadding="5">
-<tr>
-	<td colspan="3" align="left" valign="top">
-		<!-- begin position 1 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position1" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position1_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 1 -->	
-	</td>
-</tr>
-<tr>
-	<td class="firstColumn" align="left" valign="top">
-		<!-- begin position 2 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position2" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position2_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 2 -->	
-	</td>
-	<td class="secondColumn" align="left" valign="top">
-		<!-- begin position 3 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position3" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position3_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 3 -->	
-	</td>
-	<td class="thirdColumn" align="left" valign="top">
-		<!-- begin position 4 -->
-		<div class="layoutColumnPadding">
-		<tmpl_if showAdmin>
-			<table border="0" id="position4" class="content"><tbody>
-		</tmpl_if>
-
-		<tmpl_loop position4_loop>
-			<tmpl_if showAdmin>
-		            	<tr id="td<tmpl_var id>">
-		            		<td><div id="td<tmpl_var id>_div" class="dragable">
-			</tmpl_if>
-
-			<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-			<tmpl_if showAdmin>
-		         			</div></td>
-		            	</tr>
-			</tmpl_if>
-		</tmpl_loop>
-
-		<tmpl_if showAdmin>
-		            </tbody></table>
-		</tmpl_if>
-		</div>
-		<!-- end position 4 -->	
-	</td>
-</tr>
-</table>
-
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-            <tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-	width: 33%;
-}
-.secondColumn {
-    width: 33%;
-}
-.thirdColumn {
-    width: 33%;
-}
-</style>
-
diff --git a/docs/upgrades/templates-7.0.3/traditional_with_thumbnails.tmpl b/docs/upgrades/templates-7.0.3/traditional_with_thumbnails.tmpl
deleted file mode 100644
index 6209847d9..000000000
--- a/docs/upgrades/templates-7.0.3/traditional_with_thumbnails.tmpl
+++ /dev/null
@@ -1,129 +0,0 @@
-#PBtmpl0000000000000097
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p class="pagination">
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
-		&bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		&bull;
-	</tmpl_unless>
-	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-</p>
-
-<table width="100%">
-<tr>
-	<tmpl_if user.isModerator>
-		<td class="forumHead"><tmpl_var status.label></td>
-	</tmpl_if>
-	<td class="forumHead"><a href="<tmpl_var sortby.title.url>"><tmpl_var title.label></a></td>
-	<td class="forumHead"><tmpl_var thumbnail.label></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.date.url>"><tmpl_var date.label></a></td>
-	<td class="forumHead"><a href="<tmpl_var sortby.username.url>"><tmpl_var by.label></a></td>
-</tr>
-<tmpl_loop post_loop>
-	<tr>
-		<tmpl_if user.isModerator>
-			<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var status></td>
-		</tmpl_if>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a><tmpl_if user.isPoster> (<tmpl_var status>)</tmpl_if></td>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" style="text-align: center;">
-			<tmpl_if thumbnail>
-				 <a href="<tmpl_var url>"><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var title>" /></a>
-			<tmpl_else>
-				 &nbsp;
-			</tmpl_if>
-		</td>
-		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateUpdated.human></td>
-		<tmpl_if user.isVisitor>
-			<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var username></td>
-		<tmpl_else>
-			<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var userProfile.url>"><tmpl_var username></a></td>
-		</tmpl_if>
-	</tr>
-</tmpl_loop>
-</table>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<br />
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-.forumHead {
-	background-color: #DADADA;
-	border: 2px solid #cccccc;
-	padding: 2px;
-	padding-bottom: 4px;
-	font-size: 13px;
-	font-weight: bold;
-	font-family:arial;
-}
-.oddThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #83cc83;
-	padding-bottom: 4px;	
-	font-family:arial;
-}
-.forumHead a
-{
-	color:#29587E;
-}
-.oddThread a
-{
-	color:#29587E;
-}
-.evenThread a
-{
-	color:#29587E;
-}
-.evenThread {
-	font-size: 13px;
-	border-bottom: 1px dashed #aaaaff;
-	padding-bottom: 4px;
-	background-color:#EEEEEE;
-	font-family:arial;
-}
-.pagination {
-	-moz-box-sizing:border-box;
-	background:#676767;
-	color:#C0C0C0;
-	width:100%;
-	text-align:right;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-}
-.pagination a {
-	color:white;
-	font-size:8pt;
-	text-decoration:underline;
-}
-.pagination a:hover {
-	text-decoration:none;
-}
-h2
-{
-	font-family:arial;
-}
-</style>
diff --git a/docs/upgrades/templates-7.0.3/weatherdata_default_view.tmpl b/docs/upgrades/templates-7.0.3/weatherdata_default_view.tmpl
deleted file mode 100644
index a4838ee01..000000000
--- a/docs/upgrades/templates-7.0.3/weatherdata_default_view.tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-#WeatherDataTmpl0000001
-<a name="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></p>
-</tmpl_if>
-
-<tmpl_loop ourLocations.loop>
-<table border="0" width="100%">
-<tr>
-	<td rowspan="3" style="width:55px;"><img src="<tmpl_var iconUrl>" alt="<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>
diff --git a/docs/upgrades/templates-7.0.3/wgtemplate_indentnav.tmpl b/docs/upgrades/templates-7.0.3/wgtemplate_indentnav.tmpl
deleted file mode 100644
index 70d311538..000000000
--- a/docs/upgrades/templates-7.0.3/wgtemplate_indentnav.tmpl
+++ /dev/null
@@ -1,55 +0,0 @@
-#PBnav00000000indentnav
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-		
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-		
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-		
-<div class="mainNav">
-	<tmpl_loop page_loop>
-		<div class="level<tmpl_var page.relDepth>">
-			<a <tmpl_if page.isCurrent> class="navOn"</tmpl_if><tmpl_if page.isAncestor> class="anAncestor" </tmpl_if><tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
-		</div>
-	</tmpl_loop>
-</div>
-~~~
-<style type="text/css">
-.mainNav {
-
-}
-.mainNav a {
-
-}
-a.navOn {
-
-}
-a.anAncestor {
-
-}
-div.level0 a {
-	margin-left:0px;
-	display:block;
-}
-div.level1 a {
-	margin-left:15px;
-	display:block;	
-}
-div.level2 a {
-	margin-left:30px;
-	display:block;
-}
-div.level3 a {
-	margin-left:45px;
-	display:block;
-}
-div.level4 a {
-	margin-left:60px;
-	display:block;
-}
-</style>
diff --git a/docs/upgrades/templates-7.0.4/default-pm-template-project-display.tmpl b/docs/upgrades/templates-7.0.4/default-pm-template-project-display.tmpl
deleted file mode 100644
index 2fce541e7..000000000
--- a/docs/upgrades/templates-7.0.4/default-pm-template-project-display.tmpl
+++ /dev/null
@@ -1,649 +0,0 @@
-#ProjectManagerTMPL0002
-<script type="text/javascript">
-	var dayMS = 86400000;
-
-	var popTitle = "Add/Edit Task";
-
-	var dunits = "<tmpl_var project.durationUnits>";
-	var hoursPerDay = <tmpl_var project.hoursPerDay>;
-	var taskLength=<tmpl_var project.task.length>;
-
-   //--------------------------------------------------------------------------------------
-	function doCalendar (fieldId) {
-	   Calendar.setup({
-                         inputField : fieldId,
-                         ifFormat : "%Y-%m-%d",
-                         showsTime : false,
-                         step : 1,
-                         timeFormat : "12",
-                         firstDay : false
-                    });
-    }
-
-   //--------------------------------------------------------------------------------------
-    function buildMenuUrl (urltype,taskId) {
-       if(urltype == "edit") {
-	      alert("edit task: "+taskId);
-	   } else if(urltype == "insertAbove") {
-	      alert("insert task above: "+taskId);
-	   } else if(urltype == "insertBelow") {
-	      alert("insert task below: "+taskId);
-	   } else if(urltype == "delete") {
-	      alert("delete task: "+taskId);
-	   }
-	}
-
-   //--------------------------------------------------------------------------------------
-	function closeImage() {
-       return '<tmpl_var extras>/close.gif';
-    }
-
-   //--------------------------------------------------------------------------------------
-	function configureMilestone(box) {
-	   var form = box.form;
-	   if(box.checked==true) {
-	      form.end.value=form.start.value;
-		  form.duration.value=0;
-		  form.duration.disabled=true;
-		  form.end.disabled=true;
-		  form.dependants.disabled=true;
-		  form.resource.disabled=true;
-		  form.percentComplete.disabled=true;
-		  form.percentComplete.value=0;
-	   } else {
-	      form.end.disabled=false;
-		  form.duration.disabled=false;
-		  form.dependants.disabled=false;
-		  form.resource.disabled=false;
-		  form.percentComplete.disabled=false;
-		  form.duration.value = (dunits == "hrs")?hoursPerDay:1;
-	   }
-	}
-
-   //--------------------------------------------------------------------------------------
-	function checkEditTaskForm (form) {
-	   if(form.name.value == "") {
-	      alert("<tmpl_var form.name.error>");
-		  return;
-	   } else if(form.start.value == "") {
-	      alert("<tmpl_var form.start.error>");
-		  return;
-	   } else if(form.milestone.checked==false && form.end.value == "") {
-	      alert("<tmpl_var form.end.error>");
-		  return;
-	   }
-	   form.submit();
-	}
-
-   //--------------------------------------------------------------------------------------
-	function intlDate(dateObj) {
-	   return dateObj.getFullYear()+"-"+pad((dateObj.getMonth()+1))+"-"+pad(dateObj.getDate());
-	}
-
-   //--------------------------------------------------------------------------------------
-	function toDateObj(date) {
-	   var to = date.split("-");
-	   var dateObj = new Date(to[0],(to[1]-1),to[2],0,0,1,0);
-	   return dateObj;
-	}
-
-   //--------------------------------------------------------------------------------------
-	function adjustTaskTimeFromDuration(start, end, duration, isTaskForm, predecessor, origStart, origEnd, seqNum) {
-	   //set the form element
-	   var form = duration.form;
-
-	   //get today's date
-	   var today = new Date();
-	   var todayIntl = intlDate(today);
-	   //set start and end date if not already set
-	   if(start.value == "") start.value = todayIntl;
-	   if(end.value == "") end.value = todayIntl;
-
-	   //Convert predecessor hours to days
-	   var taskDuration = duration.value;
-	   if(dunits == "hrs") taskDuration = taskDuration / hoursPerDay;
-	   var durationFloor = Math.floor(taskDuration);
-
-	   //Handle task form and main form seperately due to differences in the forms
-	   if(isTaskForm && taskDuration <= 0) {
-	      //Convert to milestone if task is less or equal to zero
-	      if(confirm("Zero duration tasks are considered Milestones.  Do you wish to change this task to a milestone?")) {
-		     form.milestone.checked = true;
-			 configureMilestone(form.milestone);
-		  } else {
-			 duration.value = form.orig_duration.value;
-	      }
-		  return;
-	   } else if (taskDuration <= 0){
-	      //Do not let users zero out tasks
-		  alert("Zero duration tasks are considered Milestones.  Please edit the task by clicking the link if you wish to change this task to a milestone");
-		  return;
-	   }
-
-	   //create the start date
-	   var aTo = start.value.split("-");
-	   var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-
-	   //add new duration days to the start date
-       toDate.setDate(toDate.getDate() + durationFloor);
-
-	   //set end date to this date
-	   end.value = intlDate(toDate);
-
-	   //Set new duration in taskArray
-	   taskArray[seqNum]["duration"] = duration.value;
-	   //Adjust time based on new end date
-	   adjustTaskTimeFromDate(start, end, duration, end, isTaskForm, predecessor, origStart, origEnd, seqNum);
-	}
-
-   //--------------------------------------------------------------------------------------
-	function adjustTaskTimeFromDate (start, end, duration, element, isTaskForm, predecessor, origStart, origEnd, seqNum) {
-	   //set the form element
-	   var form = element.form;
-	   //set original duration from task form to determine whether or not to continue to set duration
-	   var orig_duration;
-
-	   if(isTaskForm) {
-	      if(form.milestone.checked == true) return;
-          orig_duration = form.orig_duration.value;
-	   }
-
-	   //Handle case where both start and end are empty
-	   if(start.value == "" && end.value == "") {
-	      //get today's date
-	      var today = new Date();
-	      var todayIntl = intlDate(today);
-	      //set start and end date if not already set
-		  start.value = todayIntl;
-		  end.value = todayIntl;
-	   }
-
-	   //Handle case where one is set and the other isn't
-	   if (end.value == "") end.value = start.value;
-	   if(start.value == "") start.value = end.value;
-
-	   if(isTaskForm && orig_duration == "") {
-	      //Set duration if this is a new record
-		  //Check to make sure start date comes before end date
-		  var startcomp = start.value.replace(/-/g,"");
-	      var endcomp = end.value.replace(/-/g,"");
-	      if(startcomp > endcomp) {
-	         alert("<tmpl_var form.greaterthan.error>");
-		     if(element.name == "start") {
-		        end.value = element.value;
-		     } else {
-		        start.value = element.value;
-		     }
-		     duration.value = (dunits == "hrs")?hoursPerDay:1;
-		     return;
-	      }
-
-	      var d = getDaysInterval(start.value,end.value);
-		  if(d == 0) d = 1;
-	      if(dunits == "hrs") {
-	         d = d * hoursPerDay;
-	      }
-	      duration.value = d;
-	   } else {
-	      //Set start/end if duration has been saved
-		  var d = duration.value;
-		  if(dunits == "hrs") {
-		     //Convert to days
-		     d = d / hoursPerDay;
-		  }
-	      //Round off duration or set it to zero if less than 1;
-		  //alert("d = " + d + " floor = " + Math.floor(d));
-		  if(d < 1) d = 0;
-		  else d = Math.floor(d);
-
-		  if(element.name.indexOf("start") > -1) {
-		     //create the date
-			  var aTo = start.value.split("-");
-			  var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-             //add duration days to the start date
-              toDate.setDate(toDate.getDate() + d);
-			  //set end date to this date
-			  end.value = intlDate(toDate);
-		  } else if(element.name.indexOf("end") > -1) {
-		      //create the date
-			  var aFrom = end.value.split("-");
-			  var fromDate = new Date(aFrom[0],(aFrom[1]-1),aFrom[2],0,0,1,0);
-			  //subtract duration days from the end date
-			  fromDate.setDate(fromDate.getDate() - d);
-			  //set start date to this date
-			  start.value = intlDate(fromDate);
-		  }
-	   }
-
-	   //Check Predecessors before moving stuff
-	   var pred = predecessor.value;
-	   if(pred != "") {
-		  //Check to make sure that the dependency requirement for this task is still valid
-		  //Get the predecessor end date
-	      var taskStart = toDateObj(start.value);
-		  var predTaskEnd;
-		  if(isTaskForm) {
-		     predTaskEnd = toDateObj(taskArray[pred]["end"]);
-		  } else {
-		     var predTaskEndId = "end_"+taskArray[pred]["id"]+"_formId"
-		     predTaskEnd = toDateObj(document.getElementById(predTaskEndId).value);
-		  }
-
-		  if(taskStart.getTime() < predTaskEnd.getTime()) {
-		     alert("<tmpl_var form.invalidMove.error>");
-			 start.value = origStart.value;
-			 end.value = origEnd.value;
-			 return;
-		  }
-	   }
-
-	   //Check all tasks past this one and move them forward if necessary (this only needs to happen on the main form)
-	   if(!isTaskForm) {
-	      arrangePredecessors(element,seqNum);
-	   }
-	   //reset orig start and end values
-	   origStart.value = start.value;
-	   origEnd.value = end.value;
-
-	   if(!isTaskForm) {
-	      //Adjust task form for
-	      paintGanttChart();
-	   }
-	}
-
-   //--------------------------------------------------------------------------------------
-   function trim(str) {
-      return str.replace(/^\s+|\s+$/, '');
-   }
-
-   //--------------------------------------------------------------------------------------
-   function arrangePredecessors (element,seqNum) {
-	  for (var i = 1; i <= taskLength; i++) {
-	     var seq = i;
-		 var task = taskArray[seq];
-		 var taskId = task["id"];
-		 //Calculate duration and duraiton floor
-		 var durationInDays = parseFloat(task["duration"]);
-		 if(dunits == "hrs") durationInDays = durationInDays / hoursPerDay;
-		 var durationFloor = Math.floor(durationInDays);
-		 //alert("Duration Floor is: "+durationFloor);
-		 //Get the current elements
-		 var currElementStart = document.getElementById("start_"+taskId+"_formId");
-	     var currElementEnd = document.getElementById("end_"+taskId+"_formId");
-		 //alert("Current Start Date: "+currElementStart.value+"   Current End Date: "+currElementEnd.value);
-		 //Skip the first record as it is the record that was changed
-		 if(seq > 1) {
-		    var predecessor = task["predecessor"];
-			//alert("predecessor for "+i+" is "+predecessor);
-			if(predecessor != "") {
-			   var pred = taskArray[predecessor];
-			   var predEndDate = toDateObj(pred["end"]);
-			   var startDate = toDateObj(task["start"]);
-			   //alert ("Pred End Date: "+intlDate(predEndDate));
-			   //Make sure start date of this task is greater than the end date of the predecessor
-			   if(startDate.getTime() <= predEndDate.getTime()) {
-			      //Change the start and end dates of the task
-				  //Get the day part of the predecessor
-				  var predDayPart = parseFloat(pred["dayPart"]);
-				  //alert("predDayPart: "+predDayPart);
-				  if(predDayPart > 0) {
-				     //The previous task took up part of a day.  Add the additional day part to the duration
-					 durationInDays += predDayPart;
-					 durationFloor = Math.floor(durationInDays);
-				  }
-				  //alert("Duration in Days: "+durationInDays+" Duration Floor: "+durationFloor);
-				  //Set the start date of this task to the end date of the predecessor
-				  currElementStart.value = pred["end"];
-				  //Adjust end date for change in start date and update the object - start date is actually predEndDate now, so use the existing date object
-				  predEndDate.setDate(predEndDate.getDate() + durationFloor);
-				  currElementEnd.value = intlDate(predEndDate);
-				 //alert("Set seq "+i+" to start: "+pred["end"]+" end: "+intlDate(predEndDate));
-			   }
-			}
-		 }
-
-		 //Update task array with new start/end values
-		 taskArray[seq]["start"] = currElementStart.value;
-		 taskArray[seq]["end"] = currElementEnd.value;
-		 taskArray[seq]["dayPart"] = (durationInDays - Math.floor(durationInDays));
-	  }
-   }
-
-   //--------------------------------------------------------------------------------------
-	function getDaysInterval(from,to) {
-       var aFrom = from.split("-");
-	   var aTo = to.split("-");
-	   var fromDate = new Date(aFrom[0],(aFrom[1]-1),aFrom[2],0,0,1,0);
-	   var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-	   var fromEpoch = fromDate.getTime();
-	   var toEpoch = toDate.getTime();
-
-	   var seconds = toEpoch - fromEpoch;
-	   if(seconds == 0) return 0;
-	   return (seconds/dayMS);
-    }
-
-   //--------------------------------------------------------------------------------------
-	function pad(date) {
-       var str = ""+date;
-       if(str.length == 1) {
-	      str = "0"+str;
-	   }
-	   return str;
-    }
-
-   //--------------------------------------------------------------------------------------
-	function paintGanttChart () {
-	   var status = AjaxRequest.submit(document.forms['editAll'],{
-                                      'onSuccess':function(req){ document.getElementById('gantt').innerHTML = req.responseText; }
-                                     });
-
-	   var mwidth = document.getElementById("projectTableWidth").name + "px";
-	   var swidth = document.getElementById("projectScrollPercentWidth").name + "%";
-	   document.getElementById("mastertable").style.width=mwidth;
-	   document.getElementById("scrolltd").style.width=swidth;
-	}
-
-   //--------------------------------------------------------------------------------------
-	function validateDependant(field,origField,seqNum,start,end,duration,isTaskForm,origStart,origEnd) {
-	   var pred = field.value;
-	   var newTask = false;
-	   if(pred != "") {
-	      if(seqNum == "") seqNum = taskLength+1;
-		  if(pred < 1) {
-	         alert("<tmpl_var form.noPredecessor.error>");
-		     field.value=origField.value;
-		     return;
-	      }
-	      if(pred == seqNum) {
-	         alert("<tmpl_var form.samePredecessor.error>");
-		     field.value=origField.value;
-		     return;
-	      }
-	      if(pred > seqNum) {
-	         alert("<tmpl_var form.previousPredecessor.error>");
-		     field.value = origField.value;
-		     return;
-	      }
-
-	      //Set defaults if it's a new record and one of the other options hasn't been checked.
-	      if(start.value == "" || end.value == "") {
-             //get today's date
-			 newTask = true;
-			 duration.value = (dunits == "hrs")?hoursPerDay:1;
-		  }
-	      //Get the predecessor end date and decide where the new start date belongs
-	      var taskStart = start.value;
-		  var taskStartObj = toDateObj(taskStart);
-		  var predTaskEnd = taskArray[pred]["end"];
-		  var predTaskEndObj = toDateObj(predTaskEnd);
-
-		  //Change start date if it comes before predecessor end date
-		  if(newTask || (taskStartObj.getTime() < predTaskEndObj.getTime())) {
-
-			 //Convert predecessor hours to days
-	         var taskDuration = duration.value;
-			 if(dunits == "hrs") taskDuration = taskDuration / hoursPerDay;
-			 var durationFloor = Math.floor(taskDuration);
-
-			 //Get the predecessor dayPart
-			 var predDayPart = parseFloat(pred["dayPart"]);
-		     if(predDayPart > 0) {
-		        //The previous task took up part of a day.  Add the additional day part to the duration
-			    taskDuration += predDayPart;
-				durationFloor = Math.floor(durationInDays);
-			 }
-
-			 //Set the start date of this task to the end date of the predecessor
-		     start.value = predTaskEnd;
-			 //Adjust end date for change in start date
-	         adjustTaskTimeFromDate(start,end,duration,start,isTaskForm,field,origStart,origEnd,seqNum);
-			 return;
-		  }
-	   }
-
-	   //Repaint
-	   if(!isTaskForm) {
-	      //Set new predecessor in taskArray
-	      taskArray[seqNum]["predecessor"] = pred;
-	      paintGanttChart();
-	   }
-	}
-
-    addEvent(window, "load", initPopUp);
-</script>
-<tmpl_var form.header>
-<table cellpadding="0" cellspacing="0" border="0" class="project" id="mastertable" style="width:<tmpl_var project.table.width>px;">
-   <tbody>
-      <tr>
-         <td style="width:20px;height:20px;">&nbsp;</td>
-	     <td style="width:300px;" align="center">Task Name</td>
-	     <td style="width:70px;" align="center">Duration</td>
-	     <td style="width:70px;" align="center">Start</td>
-	     <td style="width:70px;" align="center">Finish</td>
-	     <td style="width:30px;" align="center">Pred</td>
-	     <td rowspan="<tmpl_var project.gaant.rowspan>" valign="top" id="scrolltd" style="border-style:none;width:<tmpl_var project.scroll.percentWidth>%;">
-	        <div class="scroller" id="gantt">
-			   <tmpl_var project.ganttChart>
-		    </div>
-	     </td>
-      </tr>
-      <tr>
-	     <td colspan="6">&nbsp;</td>
-      </tr>
-      <tmpl_loop task.loop>
-      <tr id="<tmpl_var task.row.id>">
-	     <td align="center" style="height:20px"><tmpl_var task.number></td>
-	     <td align="left" style="height:20px">
-	        <tmpl_if task.canAdd>
-		       <script type="text/javascript">
-                   var cMenu = new cMenu_createWithLink("id_<tmpl_var task.number>","<tmpl_var task.name>");
-				   cMenu.addLink("<tmpl_var task.edit.url>","<tmpl_var task.edit.label>");
-				   cMenu.addLink("<tmpl_var task.insertAbove.url>","<tmpl_var task.insertAbove.label>");
-				   cMenu.addLink("<tmpl_var task.insertBelow.url>","<tmpl_var task.insertBelow.label>");
-				   cMenu.addLink("<tmpl_var task.delete.url>","<tmpl_var task.delete.label>");
-				   cMenu.print();
-               </script>
-			   <!-- <a href="<tmpl_var task.edit.url>" class="submodal"><tmpl_var task.name></a> -->
-		    <tmpl_else>
-		       <tmpl_var task.name>
-		    </tmpl_if>
-	     </td>
-	     <td align="center" style="height:20px"><tmpl_var task.duration> <tmpl_var task.duration.units></td>
-	     <td align="center" style="height:20px"><tmpl_var task.start></td>
-	     <td align="center" style="height:20px"><tmpl_var task.end></td>
-	     <td align="center" style="height:20px"><tmpl_var task.dependants></td>
-      </tr>
-      </tmpl_loop>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-   </tbody>
-</table>
-<tmpl_var form.footer>
-
-<div id="links">
-<!-- 	<tmpl_if project.canEdit><a href="<tmpl_var task.resources.url>"><tmpl_var task.resources.label></a>&nbsp;|&nbsp;</tmpl_if> -->
-	<tmpl_if task.canAdd><a href="<tmpl_var task.add.url>" class="submodal"><tmpl_var task.add.label></a>&nbsp;|&nbsp;</tmpl_if>
-	<a href="<tmpl_var task.back.url>"><tmpl_var task.back.label></a>
-</div>
-~~~
-<style type="text/css">
-body, html {
-	margin:0px;
-	padding:0px;
-}
-.project {
-	position:relative;
-	margin-top:5px;
-	margin-left:5px;
-}
-.project td {
-	border:solid silver 1px;
-	border-bottom:solid gray 1px;
-	font-size:9pt;
-	font-family:arial;
-}
-.project a {
-	color:#000000;
-	font-weight: normal;
-	font-size: 9pt;
-	text-decoration: none;
-}
-.project a:hover {
-	color:#7AB7E9;
-	font-weight: normal;
-	font-size: 9pt;
-	text-decoration: none;
-}
-.taskname {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 295px;
-}
-.taskduration {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 25px;
-}
-.taskdate {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 68px;
-}
-.taskdependant {
-	font-family: verdana;
-	font-size: 10px;
-	font-weight: normal;
-	color: black;
-	width: 20px;
-}
-tr.monthNames td {
-	text-align:center;
-}
-tr.dates td {
-	width:16px;
-}
-div.scroller {
-	overflow:scroll;
-	position:relative;
-	width:400px;
-}
-* html div.scroller {
-	overflow-x:scroll;
-}
-td.empty {
-	background-color:transparent;
-	border-style:none;
-	height:20px;
-}
-div.barPositions {
-	position:relative;
-}
-div.projectBar {
-	background-color:#7AB7E9;
-	position:absolute;
-	height:10px;
-	z-index:2;
-	padding:0px;
-	margin:0px;
-	font-size:1pt;
-}
-div.statusBar {
-	background-color:#000;
-	position:absolute;
-	height:5px;
-	z-index:3;
-	padding:0px;
-	top:2px;
-	margin:0px;
-	font-size:1pt;
-}
-div.projectLineH {
-	background: url('images/dot.gif') top repeat-x;
-	font-size:1pt;
-	text-align:right;
-	position:absolute;
-}
-div.projectLineV {
-	width:1px;
-	background-color:black;
-	position:relative;
-	font-size:1pt;
-	height:100%;
-	float:right;
-}
-div.projectLabel {
-	position:absolute;
-	margin-top:-3px;
-	white-space:nowrap;
-	font-family: verdana;
-	font-size:8px;
-}
-div.milestone {
-	color:#000000;
-	position:absolute;
-	z-index:4;
-	margin:0px;
-	padding:0px;
-	margin-top:-3px;
-	font-size: 10px;
-	font-family: times;
-}
-#links {
-	margin-top:7px;
-	margin-left:5px;
-	font-family:arial;
-	font-size:9pt;
-}
-#links a {
-	color:#7AB7E9;
-}
-</style>
-
-<style type="text/css">
-.popUp {
-	width:100%;
-	border:solid black 0px;
-	background-color:#F5F5F5;
-}
-.popUp td {
-	font-size:9pt;
-	font-family:arial;
-	border-top:solid #E0E0E0 1px;
-}
-.popUp tr.clear td {
-	border-style:none;
-	background-color:#F0F0F0;
-}
-.popUp tr.clearNoBG td {
-	border-style:none;
-}
-.popUp td.header {
-	font-weight:bold;
-}
-a.saveBtn {
-	width:40px;
-	height:15px;
-	background-color:silver;
-	padding:1px;
-	padding-left:5px;
-	padding-right:5px;
-	color:white;
-	border:solid gray 1px;
-	text-decoration:none;
-	font-weight:bold;
-	display:block;
-	float:right;
-	text-align:center;
-}
-a.saveBtn:hover {
-	background-color:#F0F0F0;
-	color:gray;
-}
-</style>
diff --git a/docs/upgrades/templates-7.0.5/default_submission_form.tmpl b/docs/upgrades/templates-7.0.5/default_submission_form.tmpl
deleted file mode 100644
index 86285e2fe..000000000
--- a/docs/upgrades/templates-7.0.5/default_submission_form.tmpl
+++ /dev/null
@@ -1,98 +0,0 @@
-#PBtmpl0000000000000068
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
-<tmpl_unless isReply><tmpl_if preview.synopsis><p><i><tmpl_var preview.synopsis></i></p></tmpl_if></tmpl_unless>
-<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
-
-<tmpl_if isReply>
-	<h1><tmpl_var message.header.label></h1>
-<tmpl_else>
-	<h1><tmpl_var submission.header.label></h1>
-</tmpl_if>
-
-<tmpl_var form.header>
-<table class="defaultSubmissionForm">
-	<tmpl_if isNewPost>
-		<tmpl_if user.isVisitor>
-			<tr>
-				<td><tmpl_var visitorName.label></td>
-				<td><tmpl_var visitorName.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td><tmpl_var title.label></td>
-		<td><tmpl_var title.form></td>
-	</tr>
-	<tmpl_unless isReply>
-		<tr>
-			<td><tmpl_var synopsis.label></td>
-			<td><tmpl_var synopsis.form></td>
-		</tr>
-	</tmpl_unless>
-	<tr>
-		<td><tmpl_var body.label></td>
-		<td><tmpl_var content.form></td>
-	</tr>
-	<tmpl_unless isReply>
-		<tmpl_if attachment.form>
-			<tr>
-				<td><tmpl_var attachment.label></td>
-				<td><tmpl_var attachment.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<div class="defaultSubmissionFormContent">
-	<b><tmpl_var reply.title></b><br /><br />
-	<tmpl_var reply.content>
-	</div>
-</tmpl_if>
-
-~~~
-
-<style type="text/css">
-table.defaultSubmissionForm td
-{
-	font-family:arial;
-	font-size:9pt;
-}
-.defaultSubmissionFormContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-h2
-{
-	font-family:arial;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-7.0.5/job_submission_form.tmpl b/docs/upgrades/templates-7.0.5/job_submission_form.tmpl
deleted file mode 100644
index 5b4bae9b6..000000000
--- a/docs/upgrades/templates-7.0.5/job_submission_form.tmpl
+++ /dev/null
@@ -1,117 +0,0 @@
-#PBtmpl0000000000000122
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<div class="jobSubmissionFormContent">
-	<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
-	<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
-	<tmpl_if preview.userDefined3><p><tmpl_var preview.userDefined3></p></tmpl_if>
-	<tmpl_if preview.userDefined1><p><tmpl_var preview.userDefined1></p></tmpl_if>
-	<tmpl_if preview.userDefined2><p><tmpl_var preview.userDefined2></p></tmpl_if>
-</div>
-
-<tmpl_if isReply>
-	<h2><tmpl_var message.header.label></h2>
-<tmpl_else>
-	<h2><tmpl_var job.header.label></h2>
-</tmpl_if>
-
-<tmpl_var form.header>
-<table class="jobSubmissionFormContent">
-	<tmpl_if isReply>
-		<tr>
-			<td><tmpl_var subject.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var message.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-	<tmpl_else>
-		<tr>
-			<td><tmpl_var job.title.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var synopsis.label></td>
-			<td><tmpl_var synopsis.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var job.description.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var job.requirements.label></td>
-			<td><tmpl_var userDefined3.form.htmlarea></td>
-		</tr>
-		<tr>
-			<td><tmpl_var compensation.label></td>
-			<td><tmpl_var userDefined1.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var location.label></td>
-			<td><tmpl_var userDefined2.form></td>
-		</tr>
-		<tmpl_if attachment.form>
-			<tr>
-				<td><tmpl_var attachment.label></td>
-				<td><tmpl_var attachment.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<div class="jobSubmissionFormContent">
-		<b><tmpl_var reply.title></b><br /><br />
-		<tmpl_var reply.content>
-		<tmpl_if reply.userDefined3><p><tmpl_var reply.userDefined3></p></tmpl_if>
-		<tmpl_if reply.userDefined1><p><tmpl_var reply.userDefined1></p></tmpl_if>
-		<tmpl_if reply.userDefined2><p><tmpl_var reply.userDefined2></p></tmpl_if>
-	</div>
-</tmpl_if>
-<p /><p />
-
-~~~
-
-<style type="text/css">
-table.jobSubmissionForm td
-{
-	font-family:arial;
-	font-size:9pt;
-}
-.jobSubmissionFormContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-h2
-{
-	font-family:arial;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-7.0.5/link_list_submission_form.tmpl b/docs/upgrades/templates-7.0.5/link_list_submission_form.tmpl
deleted file mode 100644
index c6d28aab2..000000000
--- a/docs/upgrades/templates-7.0.5/link_list_submission_form.tmpl
+++ /dev/null
@@ -1,104 +0,0 @@
-#PBtmpl0000000000000114
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<div class="linkSubmissionFormContent">
-	<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
-	<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
-	<tmpl_if preview.userDefined1><p><a href="<tmpl_var preview.userDefined1>" <tmpl_if preview.userDefined2>target="_blank"</tmpl_if>><tmpl_var preview.userDefined1></a></p></tmpl_if>
-</div>
-
-<tmpl_if isReply>
-	<h2><tmpl_var message.header.label></h2>
-<tmpl_else>
-	<h2><tmpl_var link.header.label></h2>
-</tmpl_if>
-
-<tmpl_var form.header>
-<table class="linkSubmissionForm">
-	<tmpl_if isReply>
-		<tr>
-			<td><tmpl_var subject.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var message.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-	<tmpl_else>
-		<tr>
-			<td><tmpl_var title.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var url.label></td>
-			<td><tmpl_var userDefined1.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var newWindow.label></td>
-			<td><tmpl_var userDefined2.form.yesNo></td>
-		</tr>
-		<tr>
-			<td><tmpl_var description.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-		<tmpl_if attachment.form>
-			<tr>
-				<td><tmpl_var attachment.label></td>
-				<td><tmpl_var attachment.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<div class="linkSubmissionFormContent">
-		<b><tmpl_var reply.title></b><br /><br />
-		<tmpl_var reply.content>
-		<tmpl_if reply.userDefined1><p><a href="<tmpl_var reply.userDefined1>" <tmpl_if reply.userDefined2>target="_blank"</tmpl_if>><tmpl_var reply.userDefined1></a></p></tmpl_if>
-	</div>
-</tmpl_if>
-
-~~~
-
-<style type="text/css">
-table.linkSubmissionForm td
-{
-	font-family:arial;
-	font-size:9pt;
-}
-.linkSubmissionFormContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-h2
-{
-	font-family:arial;
-}
-
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-7.0.5/wgtemplate_default_pm_project_display.tmpl b/docs/upgrades/templates-7.0.5/wgtemplate_default_pm_project_display.tmpl
deleted file mode 100644
index 0fdb02227..000000000
--- a/docs/upgrades/templates-7.0.5/wgtemplate_default_pm_project_display.tmpl
+++ /dev/null
@@ -1,664 +0,0 @@
-#ProjectManagerTMPL0002
-<script type="text/javascript">
-//<![CDATA[
-    var dayMS = 86400000;
-	
-	var popTitle = "Add/Edit Task";
-	
-	var dunits = "<tmpl_var project.durationUnits>";
-	var hoursPerDay = <tmpl_var project.hoursPerDay>;
-	var taskLength=<tmpl_var project.task.length>;
-	
-   //--------------------------------------------------------------------------------------	
-	function doCalendar (fieldId) {
-	   Calendar.setup({ 
-                         inputField : fieldId, 
-                         ifFormat : "%Y-%m-%d", 
-                         showsTime : false, 
-                         step : 1,
-                         timeFormat : "12",
-                         firstDay : false
-                    }); 
-    }
-	
-   //--------------------------------------------------------------------------------------	
-    function buildMenuUrl (urltype,taskId) {
-       if(urltype == "edit") {
-	      alert("edit task: "+taskId);
-	   } else if(urltype == "insertAbove") {
-	      alert("insert task above: "+taskId);
-	   } else if(urltype == "insertBelow") {
-	      alert("insert task below: "+taskId);
-	   } else if(urltype == "delete") {
-	      alert("delete task: "+taskId);
-	   }
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function closeImage() {
-       return '<tmpl_var extras>/close.gif';
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function configureMilestone(box) {
-	   var form = box.form;
-	   if(box.checked==true) { 
-	      form.end.value=form.start.value; 
-		  form.duration.value=0; 
-		  form.duration.disabled=true; 
-		  form.end.disabled=true;
-		  form.dependants.disabled=true;
-		  form.resource.disabled=true;
-		  form.percentComplete.disabled=true;
-		  form.percentComplete.value=0;
-	   } else { 
-	      form.end.disabled=false; 
-		  form.duration.disabled=false; 
-		  form.dependants.disabled=false;
-		  form.resource.disabled=false;
-		  form.percentComplete.disabled=false;
-		  form.duration.value = (dunits == "hrs")?hoursPerDay:1;
-	   }
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function checkEditTaskForm (form) {
-	   if(form.name.value == "") {
-	      alert("<tmpl_var form.name.error>");
-		  return;
-	   } else if(form.start.value == "") {
-	      alert("<tmpl_var form.start.error>");
-		  return;
-	   } else if(form.milestone.checked==false && form.end.value == "") {
-	      alert("<tmpl_var form.end.error>");
-		  return;
-	   }
-	   form.submit();
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function intlDate(dateObj) {
-	   return dateObj.getFullYear()+"-"+pad((dateObj.getMonth()+1))+"-"+pad(dateObj.getDate());
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function toDateObj(date) {
-	   var to = date.split("-");
-	   var dateObj = new Date(to[0],(to[1]-1),to[2],0,0,1,0);
-	   return dateObj;
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function adjustTaskTimeFromDuration(start, end, duration, isTaskForm, predecessor, origStart, origEnd, seqNum) {
-	   //set the form element
-	   var form = duration.form;
-	   
-	   //get today's date
-	   var today = new Date();
-	   var todayIntl = intlDate(today);
-	   //set start and end date if not already set
-	   if(start.value == "") start.value = todayIntl;
-	   if(end.value == "") end.value = todayIntl;
-	   	   
-	   //Convert predecessor hours to days
-	   var taskDuration = duration.value;
-	   if(dunits == "hrs") taskDuration = taskDuration / hoursPerDay;
-	   var durationFloor = Math.floor(taskDuration);
-	   
-	   //Handle task form and main form seperately due to differences in the forms
-	   if(isTaskForm && taskDuration <= 0) {
-	      //Convert to milestone if task is less or equal to zero
-	      if(confirm("Zero duration tasks are considered Milestones.  Do you wish to change this task to a milestone?")) {
-		     form.milestone.checked = true;
-			 configureMilestone(form.milestone);
-		  } else {
-			 duration.value = form.orig_duration.value;
-	      }
-		  return;
-	   } else if (taskDuration <= 0){
-	      //Do not let users zero out tasks
-		  alert("Zero duration tasks are considered Milestones.  Please edit the task by clicking the link if you wish to change this task to a milestone");
-		  return;
-	   }
-	   
-	   //create the start date 
-	   var aTo = start.value.split("-");
-	   var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-       
-	   //add new duration days to the start date
-       toDate.setDate(toDate.getDate() + durationFloor);
-			  
-	   //set end date to this date
-	   end.value = intlDate(toDate);
-	   
-	   //Set new duration in taskArray
-	   taskArray[seqNum]["duration"] = duration.value;
-	   //Adjust time based on new end date
-	   adjustTaskTimeFromDate(start, end, duration, end, isTaskForm, predecessor, origStart, origEnd, seqNum);
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function adjustTaskTimeFromDate (start, end, duration, element, isTaskForm, predecessor, origStart, origEnd, seqNum) {
-	   //set the form element
-	   var form = element.form;
-	   //set original duration from task form to determine whether or not to continue to set duration
-	   var orig_duration;
-	   
-	   if(isTaskForm) {
-	      if(form.milestone.checked == true) return;
-          orig_duration = form.orig_duration.value;
-	   }
-	   
-	   //Handle case where both start and end are empty
-	   if(start.value == "" && end.value == "") {
-	      //get today's date
-	      var today = new Date();
-	      var todayIntl = intlDate(today);
-	      //set start and end date if not already set
-		  start.value = todayIntl;
-		  end.value = todayIntl;
-	   }
-	   
-	   //Handle case where one is set and the other isn't
-	   if (end.value == "") end.value = start.value;
-	   if(start.value == "") start.value = end.value;
-	   
-	   if(isTaskForm && orig_duration == "") {
-	      //Set duration if this is a new record
-		  //Check to make sure start date comes before end date
-		  var startcomp = start.value.replace(/-/g,"");
-	      var endcomp = end.value.replace(/-/g,"");
-	      if(startcomp > endcomp) {
-	         alert("<tmpl_var form.greaterthan.error>");
-		     if(element.name == "start") {
-		        end.value = element.value;
-		     } else {
-		        start.value = element.value;
-		     }
-		     duration.value = (dunits == "hrs")?hoursPerDay:1;
-		     return;
-	      }
-	   
-	      var d = getDaysInterval(start.value,end.value);
-		  if(d == 0) d = 1;
-	      if(dunits == "hrs") {
-	         d = d * hoursPerDay;
-	      }
-	      duration.value = d;
-	   } else {
-	      //Set start/end if duration has been saved
-		  var d = duration.value; 
-		  if(dunits == "hrs") {
-		     //Convert to days
-		     d = d / hoursPerDay;
-		  }
-	      //Round off duration or set it to zero if less than 1;
-		  //alert("d = " + d + " floor = " + Math.floor(d));
-		  if(d < 1) d = 0;
-		  else d = Math.floor(d);
-		  
-		  if(element.name.indexOf("start") > -1) {
-		     //create the date 
-			  var aTo = start.value.split("-");
-			  var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-             //add duration days to the start date
-              toDate.setDate(toDate.getDate() + d);
-			  //set end date to this date
-			  end.value = intlDate(toDate);
-		  } else if(element.name.indexOf("end") > -1) {
-		      //create the date
-			  var aFrom = end.value.split("-");
-			  var fromDate = new Date(aFrom[0],(aFrom[1]-1),aFrom[2],0,0,1,0);
-			  //subtract duration days from the end date
-			  fromDate.setDate(fromDate.getDate() - d);
-			  //set start date to this date
-			  start.value = intlDate(fromDate);
-		  }
-	   }
-	   
-	   //Check Predecessors before moving stuff
-	   var pred = predecessor.value;
-	   if(pred != "") {
-		  //Check to make sure that the dependency requirement for this task is still valid
-		  //Get the predecessor end date
-	      var taskStart = toDateObj(start.value);
-		  var predTaskEnd;
-		  if(isTaskForm) {
-		     predTaskEnd = toDateObj(taskArray[pred]["end"]);
-		  } else {
-		     var predTaskEndId = "end_"+taskArray[pred]["id"]+"_formId"
-		     predTaskEnd = toDateObj(document.getElementById(predTaskEndId).value);
-		  }
-		  
-		  if(taskStart.getTime() < predTaskEnd.getTime()) {
-		     alert("<tmpl_var form.invalidMove.error>");
-			 start.value = origStart.value;
-			 end.value = origEnd.value;
-			 return;
-		  }
-	   }
-	   
-	   //Check all tasks past this one and move them forward if necessary (this only needs to happen on the main form)
-	   if(!isTaskForm) {
-	      arrangePredecessors(element,seqNum);
-	   }
-	   //reset orig start and end values
-	   origStart.value = start.value;
-	   origEnd.value = end.value;
-	   
-	   if(!isTaskForm) {
-	      //Adjust task form for 
-	      paintGanttChart();
-	   }
-	}
-   
-   //--------------------------------------------------------------------------------------
-   function trim(str) {
-      return str.replace(/^\s+|\s+$/, '');
-   }
-	
-   //--------------------------------------------------------------------------------------
-   function arrangePredecessors (element,seqNum) {
-	  for (var i = 1; i <= taskLength; i++) {
-	     var seq = i;
-		 var task = taskArray[seq];
-		 var taskId = task["id"];
-		 //Calculate duration and duraiton floor
-		 var durationInDays = parseFloat(task["duration"]);
-		 if(dunits == "hrs") durationInDays = durationInDays / hoursPerDay;
-		 var durationFloor = Math.floor(durationInDays);
-		 //alert("Duration Floor is: "+durationFloor);
-		 //Get the current elements
-		 var currElementStart = document.getElementById("start_"+taskId+"_formId");
-	     var currElementEnd = document.getElementById("end_"+taskId+"_formId");
-		 //alert("Current Start Date: "+currElementStart.value+"   Current End Date: "+currElementEnd.value);
-		 //Skip the first record as it is the record that was changed
-		 if(seq > 1) {
-		    var predecessor = task["predecessor"];
-			//alert("predecessor for "+i+" is "+predecessor);
-			if(predecessor != "") {
-			   var pred = taskArray[predecessor];
-			   var predEndDate = toDateObj(pred["end"]);
-			   var startDate = toDateObj(task["start"]);
-			   //alert ("Pred End Date: "+intlDate(predEndDate));
-			   //Make sure start date of this task is greater than the end date of the predecessor
-			   if(startDate.getTime() <= predEndDate.getTime()) {
-			      //Change the start and end dates of the task
-				  //Get the day part of the predecessor
-				  var predDayPart = parseFloat(pred["dayPart"]);
-				  //alert("predDayPart: "+predDayPart);
-				  if(predDayPart > 0) {
-				     //The previous task took up part of a day.  Add the additional day part to the duration
-					 durationInDays += predDayPart;
-					 durationFloor = Math.floor(durationInDays);
-				  }
-				  //alert("Duration in Days: "+durationInDays+" Duration Floor: "+durationFloor);
-				  //Set the start date of this task to the end date of the predecessor
-				  currElementStart.value = pred["end"];
-				  //Adjust end date for change in start date and update the object - start date is actually predEndDate now, so use the existing date object
-				  predEndDate.setDate(predEndDate.getDate() + durationFloor);
-				  currElementEnd.value = intlDate(predEndDate);
-				 //alert("Set seq "+i+" to start: "+pred["end"]+" end: "+intlDate(predEndDate));
-			   }
-			}
-		 }
-		  
-		 //Update task array with new start/end values
-		 taskArray[seq]["start"] = currElementStart.value;
-		 taskArray[seq]["end"] = currElementEnd.value;
-		 taskArray[seq]["dayPart"] = (durationInDays - Math.floor(durationInDays));
-	  }
-   }
-	
-   //--------------------------------------------------------------------------------------	
-	function getDaysInterval(from,to) {
-       var aFrom = from.split("-");
-	   var aTo = to.split("-");
-	   var fromDate = new Date(aFrom[0],(aFrom[1]-1),aFrom[2],0,0,1,0);
-	   var toDate = new Date(aTo[0],(aTo[1]-1),aTo[2],0,0,1,0);
-	   var fromEpoch = fromDate.getTime();
-	   var toEpoch = toDate.getTime();
-	  
-	   var seconds = toEpoch - fromEpoch;
-	   if(seconds == 0) return 0;
-	   return (seconds/dayMS);
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function pad(date) {
-       var str = ""+date;
-       if(str.length == 1) {
-	      str = "0"+str;
-	   }
-	   return str;
-    }
-	
-   //--------------------------------------------------------------------------------------	
-	function paintGanttChart () {
-	   var status = AjaxRequest.submit(document.forms['editAll'],{
-                                      'onSuccess':function(req){ document.getElementById('gantt').innerHTML = req.responseText; }
-                                     });
-       
-	   var mwidth = document.getElementById("projectTableWidth").name + "px";
-	   var swidth = document.getElementById("projectScrollPercentWidth").name + "%";
-	   document.getElementById("mastertable").style.width=mwidth;
-	   document.getElementById("scrolltd").style.width=swidth;
-	}
-	
-   //--------------------------------------------------------------------------------------	
-	function validateDependant(field,origField,seqNum,start,end,duration,isTaskForm,origStart,origEnd) {
-	   var pred = field.value;
-	   var newTask = false;
-	   if(pred != "") {
-	      if(seqNum == "") seqNum = taskLength+1;
-		  if(pred < 1) {
-	         alert("<tmpl_var form.noPredecessor.error>");
-		     field.value=origField.value;
-		     return;
-	      }
-	      if(pred == seqNum) {
-	         alert("<tmpl_var form.samePredecessor.error>");
-		     field.value=origField.value;
-		     return;
-	      }
-	      if(pred > seqNum) {
-	         alert("<tmpl_var form.previousPredecessor.error>");
-		     field.value = origField.value;
-		     return; 
-	      }
-		  
-	      //Set defaults if it's a new record and one of the other options hasn't been checked.
-	      if(start.value == "" || end.value == "") {
-             //get today's date
-			 newTask = true;
-			 duration.value = (dunits == "hrs")?hoursPerDay:1; 
-		  }
-	      //Get the predecessor end date and decide where the new start date belongs
-	      var taskStart = start.value;
-		  var taskStartObj = toDateObj(taskStart);
-		  var predTaskEnd = taskArray[pred]["end"];
-		  var predTaskEndObj = toDateObj(predTaskEnd);
-		  
-		  //Change start date if it comes before predecessor end date
-		  if(newTask || (taskStartObj.getTime() < predTaskEndObj.getTime())) {
-		     
-			 //Convert predecessor hours to days
-	         var taskDuration = duration.value;
-			 if(dunits == "hrs") taskDuration = taskDuration / hoursPerDay;
-			 var durationFloor = Math.floor(taskDuration);
-			 
-			 //Get the predecessor dayPart
-			 var predDayPart = parseFloat(pred["dayPart"]);
-		     if(predDayPart > 0) {
-		        //The previous task took up part of a day.  Add the additional day part to the duration
-			    taskDuration += predDayPart;
-				durationFloor = Math.floor(durationInDays);
-			 }
-	         
-			 //Set the start date of this task to the end date of the predecessor
-		     start.value = predTaskEnd;
-			 //Adjust end date for change in start date
-	         adjustTaskTimeFromDate(start,end,duration,start,isTaskForm,field,origStart,origEnd,seqNum);
-			 return;
-		  }
-	   }
-	   
-	   //Repaint
-	   if(!isTaskForm) {
-	      //Set new predecessor in taskArray
-	      taskArray[seqNum]["predecessor"] = pred;
-	      paintGanttChart();
-	   }
-	}
-   
-    addEvent(window, "load", initPopUp);
-//]]>
-</script>
-<tmpl_var form.header>
-<table cellpadding="0" cellspacing="0" border="0" class="project" id="mastertable" style="width:<tmpl_var project.table.width>px;">
-   <tbody>
-      <tr>
-         <td style="width:20px;height:20px;">&nbsp;</td>
-	     <td style="width:300px;" align="center">Task Name</td>
-	     <td style="width:70px;" align="center">Duration</td>
-	     <td style="width:70px;" align="center">Start</td>
-	     <td style="width:70px;" align="center">Finish</td>
-	     <td style="width:30px;" align="center">Pred</td>
-	     <td rowspan="<tmpl_var project.gantt.rowspan>" valign="top" id="scrolltd" style="border-style:none;width:<tmpl_var project.scroll.percentWidth>%;">
-	        <div class="scroller" id="gantt">
-			   <tmpl_var project.ganttChart>
-		    </div>
-	     </td>
-      </tr>
-      <tr>
-	     <td colspan="6">&nbsp;</td>
-      </tr>
-      <tmpl_loop task.loop>
-      <tr id="<tmpl_var task.row.id>">
-	     <td align="center" style="height:20px"><tmpl_var task.number></td>
-	     <td align="left" style="height:20px">
-	        <tmpl_if task.canAdd>
-		       <script type="text/javascript">
-			   //<![CDATA[
-                   var cMenu = new cMenu_createWithLink("id_<tmpl_var task.number>","<tmpl_var task.name>");
-				   cMenu.addLink("<tmpl_var task.edit.url>","<tmpl_var task.edit.label>");
-				   cMenu.addLink("<tmpl_var task.insertAbove.url>","<tmpl_var task.insertAbove.label>");
-				   cMenu.addLink("<tmpl_var task.insertBelow.url>","<tmpl_var task.insertBelow.label>");
-				   cMenu.addLink("<tmpl_var task.delete.url>","<tmpl_var task.delete.label>");
-				   cMenu.print();
-				//]]>
-               </script>
-			   <!-- <a href="<tmpl_var task.edit.url>" class="submodal"><tmpl_var task.name></a> -->
-		    <tmpl_else>
-		       <tmpl_var task.name>
-		    </tmpl_if>
-	     </td>
-	     <td align="center" style="height:20px"><tmpl_var task.duration> <tmpl_var task.duration.units></td>
-	     <td align="center" style="height:20px"><tmpl_var task.start></td>
-	     <td align="center" style="height:20px"><tmpl_var task.end></td>
-	     <td align="center" style="height:20px"><tmpl_var task.dependants></td>	
-      </tr>
-      </tmpl_loop>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-   </tbody>
-</table>
-<tmpl_var form.footer>
-
-<div id="links">
-<!-- 	<tmpl_if project.canEdit><a href="<tmpl_var task.resources.url>"><tmpl_var task.resources.label></a>&nbsp;|&nbsp;</tmpl_if> -->
-	<tmpl_if task.canAdd><a href="<tmpl_var task.add.url>" class="submodal"><tmpl_var task.add.label></a>&nbsp;|&nbsp;</tmpl_if>
-	<a href="<tmpl_var task.back.url>"><tmpl_var task.back.label></a>
-</div>
-
-~~~
-<style type="text/css">
-	body, html {
-		margin:0px;
-		padding:0px;
-	}
-	.project {
-		position:relative;
-		margin-top:5px;
-		margin-left:5px;
-	}
-	.project td {
-		border:solid silver 1px;
-		border-bottom:solid gray 1px;
-		font-size:9pt;
-		font-family:arial;		
-	}
-	.project a {
-	    color:#000000;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.project a:hover {
-	    color:#7AB7E9;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.taskname {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 295px;
-    }
-	.taskduration {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 25px;
-	}
-	.taskdate {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 68px;
-	}
-	.taskdependant {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 20px;
-	}
-	tr.monthNames td {		
-		text-align:center;		
-	}
-	tr.dates td {
-		width:16px;
-	}
-	div.scroller {		
-		overflow:scroll;		
-		position:relative;
-		width:400px;		
-	}
-	
-	* html div.scroller {
-		overflow-x:scroll;
-	}
-	
-	td.empty {
-		background-color:transparent;
-		border-style:none;
-		height:20px;
-	}
-	
-	div.barPositions {
-		position:relative;
-	}
-	div.projectBar {
-		background-color:#7AB7E9;
-		position:absolute;
-		height:10px;
-		z-index:2;
-		padding:0px;
-		margin:0px;
-		font-size:1pt;
-	}
-	div.statusBar {	
-		background-color:#000;
-		position:absolute;	
-		height:5px;
-		z-index:3;
-		padding:0px;
-		top:2px;
-		margin:0px;		
-		font-size:1pt;		
-	}
-	
-	div.projectLineH {		
-		background: url('images/dot.gif') top repeat-x;		
-		font-size:1pt;
-		text-align:right;
-		position:absolute;
-	}		
-	div.projectLineV {
-		width:1px;
-		background-color:black;
-		position:relative;
-		font-size:1pt;	
-		height:100%;
-		float:right;
-	}
-	
-	div.projectLabel {
-		position:absolute;
-		margin-top:-3px;
-		white-space:nowrap;
-		font-family: verdana;
-		font-size:8px;
-	}
-	
-	div.milestone {
-		color:#000000;
-		position:absolute;
-		z-index:4;
-		margin:0px;
-		padding:0px;		
-		margin-top:-3px;
-		font-size: 10px;
-		font-family: times;
-	}
-	
-	#links {
-		margin-top:7px;
-		margin-left:5px;
-		font-family:arial;
-		font-size:9pt;
-	}
-	
-	#links a {
-		color:#7AB7E9;
-	}
-</style>
-
-<style>
-.popUp {
-			width:100%;
-			border:solid black 0px;
-			background-color:#F5F5F5;
-		}
-		.popUp td {
-			font-size:9pt;	
-			font-family:arial;
-			border-top:solid #E0E0E0 1px;
-		}	
-		.popUp tr.clear td {
-			border-style:none;
-			background-color:#F0F0F0;
-		}
-		.popUp tr.clearNoBG td {
-			border-style:none;
-		}
-		.popUp td.header {
-			font-weight:bold;
-		}
-		a.saveBtn {
-			width:40px;
-			height:15px;
-			background-color:silver;
-			padding:1px;
-			padding-left:5px;
-			padding-right:5px;
-			color:white;
-			border:solid gray 1px;
-			text-decoration:none;
-			font-weight:bold;
-			display:block;
-			float:right;
-			text-align:center;
-		}
-		a.saveBtn:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-</style>
diff --git a/docs/upgrades/templates-7.0.7/admin_console.tmpl b/docs/upgrades/templates-7.0.7/admin_console.tmpl
deleted file mode 100644
index a409ad346..000000000
--- a/docs/upgrades/templates-7.0.7/admin_console.tmpl
+++ /dev/null
@@ -1,78 +0,0 @@
-#PBtmpl0000000000000001
-
-<div id="application_title" style="height:73px;">
-	<tmpl_var application.title>
-</div>
-<div id="application_workarea">
-	<tmpl_var application.workArea>
-</div>
-<div id="console_workarea">
-	<div class="adminConsoleSpacer">
-		&#160;
-	</div>
-	<tmpl_loop application_loop>
-		<tmpl_if canUse>
-			<div class="adminConsoleApplication">
-				<a href="<tmpl_var url>"><img src="<tmpl_var icon>" style="border-style:none;" title="<tmpl_var title>" alt="<tmpl_var title>" /></a><br />
-				<a href="<tmpl_var url>"><tmpl_var title></a>
-			</div>
-		</tmpl_if>
-	</tmpl_loop>
-	<div class="adminConsoleSpacer">
-		&#160;
-	</div>
-</div>
-<div class="adminConsoleMenu">
-	<div id="adminConsoleMainMenu" class="adminConsoleMainMenu">
-		<div id="console_toggle_on">
-			<a href="#" onclick="toggleAdminConsole()"><tmpl_var toggle.on.label></a><br />
-		</div>
-		<div id="console_toggle_off">
-			<a href="#" onclick="toggleAdminConsole()"><tmpl_var toggle.off.label></a><br />
-		</div>
-	</div>
-	<tmpl_if submenu_loop>
-	<div id="adminConsoleApplicationSubmenu" class="adminConsoleApplicationSubmenu">
-		<tmpl_loop submenu_loop>
-			<a href="<tmpl_var url>" <tmpl_var extras>><tmpl_var label></a><br />
-		</tmpl_loop>
-	</div>
-	</tmpl_if>
-	<tmpl_if versionTags>
-	<div id="adminConsoleVersionTags" class="adminConsoleVersionTags">
-		<tmpl_loop versionTags>
-			<a href="<tmpl_var url>"><tmpl_var title></a><br />
-		</tmpl_loop>
-	</div>
-	</tmpl_if>
-	<div id="adminConsoleUtilityMenu" class="adminConsoleUtilityMenu">
-		<a href="<tmpl_var backtosite.url>"><tmpl_var backtosite.label></a><br />
-		^AdminToggle;<br />
-		^LoginToggle;<br />
-	</div>
-</div>
-<div id="console_title">
-	<tmpl_var console.title>
-</div>
-<div id="application_help">
-	<tmpl_if help.url>
-		<a href="#" onclick="window.open('<tmpl_var help.url>')"><img src="^Extras(adminConsole/small/help.gif);" alt="?" style="border-style:none;" /></a>
-	</tmpl_if>
-</div>
-<div id="application_icon">
-	<img src="<tmpl_var application.icon>" style="border-style:none;height:48px;width:48px;" title="<tmpl_var application.title>" alt="<tmpl_var application.title>" />
-</div>
-<div class="adminConsoleTitleIconMedalian">
-<img src="^Extras(adminConsole/medalian.gif);" style="border-style:none;height:65px;width:65px;" alt="*" />
-</div>
-<div id="console_icon">
-	<img src="<tmpl_var console.icon>" style="border-style:none;" title="<tmpl_var console.title>" alt="<tmpl_var console.title>" />
-</div>
-<script type="text/javascript" defer="defer">
-	initAdminConsole(<tmpl_if application.title>true<tmpl_else>false</tmpl_if>,<tmpl_if submenu_loop>true<tmpl_else>false</tmpl_if>);
-</script>
-
-~~~
-
-<link href="^Extras(adminConsole/adminConsole.css);" type="text/css" rel="stylesheet" />
-<script src="^Extras(adminConsole/adminConsole.js);" type="text/javascript"></script>
\ No newline at end of file
diff --git a/docs/upgrades/templates-7.0.7/matrix_detailed_listing.tmpl b/docs/upgrades/templates-7.0.7/matrix_detailed_listing.tmpl
deleted file mode 100644
index c7e037722..000000000
--- a/docs/upgrades/templates-7.0.7/matrix_detailed_listing.tmpl
+++ /dev/null
@@ -1,105 +0,0 @@
-#matrixtmpl000000000003
-
-<h2><tmpl_var productName></h2>
-
-
-<table class="content" border="0" cellspacing="5">
-<tr><td valign="top">
-		<table class="content">
-		<tr><td><b>Web Site</b></td><td><a onclick="window.open('<tmpl_var productUrl.click>')" href="#"><tmpl_var productUrl></a></td></tr>
-		<tr><td><b>Version Number</b></td><td><tmpl_var versionNumber></td></tr>
-		<tr><td><b>Manufacturer</b></td><td><a onclick="window.open('<tmpl_var manufacturerUrl.click>')" href="#"><tmpl_var manufacturerName></a></td></tr>
-		<tr><td><b>Last Updated</b></td><td><tmpl_var lastUpdated.date></td></tr>
-		<tr><td><b>Clicks</b></td><td><tmpl_var clicks></td></tr>
-		<tr><td><b>Views</b></td><td><tmpl_var views></td></tr>
-		<tr><td><b>Compares</b></td><td><tmpl_var compares></td></tr>
-		<tr><td><b>Screenshot</b></td><td><a href="<tmpl_var screenshot>"><img src="<tmpl_var thumbnail>" alt="Screenshot"`></a></td></tr>
-		</table>
-	</td>
-	<td valign="top" style="background-color:silver;">&nbsp;</td>
-	<td valign="top">
-		<tmpl_if description>
-			<b>Description</b><br />
-			<tmpl_var description><br /><br />
-		</tmpl_if>
-
-		<b>Contact Maintainer</b><br />
-		<tmpl_if email.wasSent>
-			<div style="color: green;">Message sent.<br /></div>
-		</tmpl_if>
-		<tmpl_var email.form>
-	</td>
-	<td valign="top" style="background-color:silver;">&nbsp;</td>
-	<td valign="top">
-		<tmpl_var ratings>
-	</td>
-</tr>
-</table>
-
-<p />
-
-<table width="100%"  class="content">
-<tr>
-	<td valign="top" style="width:50%">
-		<span class="category">Features</span>
-		<table class="content" width="180">
-
-		<tmpl_loop features_loop>
-		<tr<tmpl_if __ODD__> class="odd"<tmpl_else> class="even"</tmpl_if>>
-			<td onmouseover="return escape('<tmpl_var description>')"><tmpl_var label></td>
-			<td><tmpl_var value></td>
-		</tr>
-		</tmpl_loop>
-		<tr>
-			<td>&#160;</td>
-			<td>&#160;</td>
-		</tr>
-		</table>
-		
-		<p />
-	</td>
-	<td valign="top" style="width:50%;">
-		<span class="category">Benefits</span>
-		<table class="content" width="180">
-
-		<tmpl_loop benefits_loop>
-		<tr<tmpl_if __ODD__> class="odd"<tmpl_else> class="even"</tmpl_if>>
-			<td onmouseover="return escape('<tmpl_var description>')"><tmpl_var label></td>
-			<td class="<tmpl_var class>"><tmpl_var value></td>
-		</tr>
-		</tmpl_loop>
-		<tr>
-			<td>&#160;</td>
-			<td>&#160;</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-
-<p />
-
-<tmpl_var discussion>
-
-<tmpl_if user.canEdit>
-  <br /> <hr /><a href="<tmpl_var edit.url>">Edit this listing.</a> <br />
-</tmpl_if>
-<tmpl_if user.canApprove>
- <tmpl_if isPending>
-   <a href="<tmpl_var approve.url>">Approve this listing.</a><br />
- </tmpl_if>
-   <a href="<tmpl_var delete.url>">Delete this listing.</a><br />
-  
-</tmpl_if>
-
-~~~
-
-<style type="text/css">
-.ratingForm {
- font-size: 9px;
-}
-.statBox {
-	width:100%;
-}
-</style>
-
diff --git a/docs/upgrades/templates-7.0.7/project_manager_edit_task.tmpl b/docs/upgrades/templates-7.0.7/project_manager_edit_task.tmpl
deleted file mode 100644
index 52bc7a553..000000000
--- a/docs/upgrades/templates-7.0.7/project_manager_edit_task.tmpl
+++ /dev/null
@@ -1,93 +0,0 @@
-#ProjectManagerTMPL0004
-
-<tmpl_var form.header>
-<table class="popUp" cellspacing="0" cellpadding="3" border="0">
-<tbody>
-<tr>
-	<td align="right" style="width:25%;" class="header">Task Name&nbsp;</td>
-	<td style="width:75%;"><tmpl_var form.name></td>
-</tr>	
-<tr>
-	<td colspan="2">
-		<table width="100%" cellpadding="3" cellspacing="0">
-		<tbody>
-		<tr class="clear">
-			<td style="width:25%;" align="right" class="header">Start&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.start></td>
-			<td style="width:25%;" align="right" class="header">Finish&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.end></td>
-		</tr>
-		</tbody>
-		</table>
-	</td>
-</tr>
-<tr>
-	<td colspan="2">
-		<table width="100%" cellpadding="3" cellspacing="0">
-		<tbody>
-		<tr class="clear">
-			<td style="width:25%; text-align:right" class="header">Duration&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.duration>&nbsp;<tmpl_var form.duration.units></td>
-			<td style="width:25%; text-align:right" class="header">Lag Time&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.lagTime>&nbsp;<tmpl_var form.lagTime.units></td>
-		</tr><tr class="clear">
-			<td style="width:50%;" colspan="2">&nbsp;</td>
-			<td style="width:25%;" align="right" class="header">Is Milestone&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.milestone></td>
-		</tr>
-		</tbody>
-		</table>
-	</td>
-</tr>	
-<tr>
-	<td colspan="2">
-		<table width="100%" cellpadding="3" cellspacing="0">
-		<tbody>
-		<tr class="clear">
-			<td style="width:25%;" align="right" class="header">Predecessor&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.dependants></td>
-			<td style="width:25%;" align="right" class="header">% Complete&nbsp;</td>
-			<td style="width:25%;"><tmpl_var form.percentComplete></td>
-		</tr>
-		</tbody>
-		</table>
-	</td>
-</tr>
-
-<tr>
-	<td colspan="2">
-		<table width="100%" cellpadding="3" cellspacing="0">
-		<tbody>
-		<tr class="clearNoBG" style="text-align:center;">
-			<td style="text-align:left;">
-                           <span class="header">Resources:</span><br /><br />
-                           <span style="margin-bottom:2px;padding-bottom:2px;padding-left:5px;-moz-box-sizing:border-box;display:block;">
-                              <a style="text-decoration:none;" id="<tmpl_var form.addUser.id>" href="<tmpl_var form.addUser.link>" target="_new" onclick="taskEdit_searchPopup(this.href); return false;"><img style="border-style:none;vertical-align:middle;" title="<tmpl_var form.addUser.text>" alt="<tmpl_var form.addUser.text>" src="<tmpl_var assetExtras>/users.gif" /><span style="text-decoration:none;font-size:8pt;"> Add User To Task</span></a>&nbsp;&nbsp;&nbsp;&nbsp;
-                              <a style="text-decoration:none;" id="<tmpl_var form.addGroup.id>" href="<tmpl_var form.addGroup.link>" target="_new" onclick="taskEdit_searchPopup(this.href); return false;"><img style="border-style:none;vertical-align:middle;" title="<tmpl_var form.addGroup.text>" alt="<tmpl_var form.addGroup.text>" src="<tmpl_var assetExtras>/groups.gif" /><span style="text-decoration:none;font-size:8pt;"> Add Group to Task</span></a>
-                           </span><tmpl_var form.resourceDiv>
-                        </td>			
-		</tr>
-		<tr>
-			<td style="text-align:right;" class="header"><a href="javascript:void(checkEditTaskForm(document.editTaskForm))" class="saveBtn">Save</a></td>
-		</tr>
-		</tbody>
-		</table>
-	</td>		
-</tr>
-
-
-</tbody>
-</table>
-<tmpl_var form.footer>
-
-~~~
-
-<style type="text/css">
-.PM_small {
-	font-size:8pt;
-}
-tr.clearNoBG a {
-	text-decoration:none;
-	color:navy;
-}
-</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-7.0.7/project_manager_gantt_chart.tmpl b/docs/upgrades/templates-7.0.7/project_manager_gantt_chart.tmpl
deleted file mode 100644
index 002e0c868..000000000
--- a/docs/upgrades/templates-7.0.7/project_manager_gantt_chart.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#ProjectManagerTMPL0003
-
-<script type="text/javascript">
-	taskArray=<tmpl_var project.task.array>;
-</script>
-<div class="barPositions">
-   <tmpl_loop task.div.loop>
-      <tmpl_if task.isMilestone>      
-	     <div class="milestone" style="left:<tmpl_var task.div.left>px;top:<tmpl_var task.div.top>px;">&diams;</div>
-	  <tmpl_else>
-	     <div class="projectBar" style="left:<tmpl_var task.div.left>px;top:<tmpl_var task.div.top>px;width:<tmpl_var task.div.width>px;background-color:<tmpl_var task.div.color>">
-		    <div class="statusBar" style="width:<tmpl_var task.div.percentComplete>%;"></div>
-            <tmpl_if task.hasPredecessor>   
-		       <div class="projectLineH" style="top:4px;left:50px;width:75px;height:28px;">
-	              <div class="projectLineV"></div>
-		       </div>
-	        </tmpl_if>
-	        <tmpl_if task.hasResource>
-		       <div class="projectLabel" style="left:<tmpl_var task.div.label.left>px;top:3px;margin-top:-3px;">
-		          <tmpl_var task.resource.name>			
-		       </div>
-	        </tmpl_if> 
-		 </div>
-	  </tmpl_if>	  
-   </tmpl_loop>
-   <a name="<tmpl_var project.table.width>" id="projectTableWidth"></a>
-   <a name="<tmpl_var project.scroll.percentWidth>" id="projectScrollPercentWidth"></a>
-   <table cellpadding="0" cellspacing="0" border="0" style="width:<tmpl_var scrollWidth>px;z-index:1;">
-      <tr class="monthNames">
-	     <tmpl_loop months.loop>
-		    <td colspan="<tmpl_var month.colspan>" class="monthName" style="height:20px;"><tmpl_var month.name></td>
-		 </tmpl_loop>
-	  </tr>	
-	  <tr class="dates">
-	     <tmpl_loop days.loop>
-		    <td  align="center" style="width:23px"><tmpl_var day.number></td>
-		 </tmpl_loop>
-	  </tr>
-	  <tmpl_loop task.count.loop>
-	     <tr>
-		    <td colspan="<tmpl_var total.colspan>" class="empty" style="height:21px;">&nbsp;</td>
-	     </tr>
-	  </tmpl_loop>
-   </table>
-   <br />
-</div>
-
diff --git a/docs/upgrades/templates-7.0.7/project_manager_project_display.tmpl b/docs/upgrades/templates-7.0.7/project_manager_project_display.tmpl
deleted file mode 100644
index fa7ba1a7d..000000000
--- a/docs/upgrades/templates-7.0.7/project_manager_project_display.tmpl
+++ /dev/null
@@ -1,274 +0,0 @@
-#ProjectManagerTMPL0002
-
-<script type="text/javascript">
-//<![CDATA[
-dunits = "<tmpl_var project.durationUnits>";
-hoursPerDay = <tmpl_var project.hoursPerDay>;
-taskLength = <tmpl_var project.task.length>;
-extrasPath = '<tmpl_var extras>';
-errorMsgs = {
-   'name' : "<tmpl_var form.name.error>",
-   'start' : "<tmpl_var form.start.error>",
-   'end' : "<tmpl_var form.end.error>",
-   'greaterthan' : "<tmpl_var form.greaterthan.error>",
-   'invalidMove' : "<tmpl_var form.invalidMove.error>",
-   'noPredecessor' : "<tmpl_var form.noPredecessor.error>",
-   'samePredecessor' : "<tmpl_var form.samePredecessor.error>",
-   'previousPredecessor' : "<tmpl_var form.previousPredecessor.error>"
-};
-
-addEvent(window, "load", initPopUp);
-//]]>
-</script>
-<tmpl_var form.header>
-<table cellpadding="0" cellspacing="0" border="0" class="project" id="mastertable" style="width:<tmpl_var project.table.width>px;">
-   <tbody>
-      <tr>
-         <td style="width:20px;height:20px;">&nbsp;</td>
-	     <td style="width:300px;" align="center">Task Name</td>
-	     <td style="width:70px;" align="center">Duration</td>
-	     <td style="width:70px;" align="center">Start</td>
-	     <td style="width:70px;" align="center">Finish</td>
-	     <td style="width:30px;" align="center">Pred</td>
-	     <td rowspan="<tmpl_var project.gantt.rowspan>" valign="top" id="scrolltd" style="border-style:none;width:<tmpl_var project.scroll.percentWidth>%;">
-	        <div class="scroller" id="gantt">
-			   <tmpl_var project.ganttChart>
-		    </div>
-	     </td>
-      </tr>
-      <tr>
-	     <td colspan="6">&nbsp;</td>
-      </tr>
-      <tmpl_loop task.loop>
-      <tr id="<tmpl_var task.row.id>">
-	     <td align="center" style="height:20px"><tmpl_var task.number></td>
-	     <td align="left" style="height:20px">
-	        <tmpl_if task.canAdd>
-		       <script type="text/javascript">
-			   //<![CDATA[
-                   var cMenu = new cMenu_createWithLink("id_<tmpl_var task.number>","<tmpl_var task.name>");
-				   cMenu.addLink("<tmpl_var task.edit.url>","<tmpl_var task.edit.label>");
-				   cMenu.addLink("<tmpl_var task.insertAbove.url>","<tmpl_var task.insertAbove.label>");
-				   cMenu.addLink("<tmpl_var task.insertBelow.url>","<tmpl_var task.insertBelow.label>");
-				   cMenu.addLink("<tmpl_var task.delete.url>","<tmpl_var task.delete.label>");
-				   cMenu.print();
-				//]]>
-               </script>
-			   <!-- <a href="<tmpl_var task.edit.url>" class="submodal-400-350"><tmpl_var task.name></a> -->
-		    <tmpl_else>
-		       <tmpl_var task.name>
-		    </tmpl_if>
-	     </td>
-	     <td align="center" style="height:20px"><tmpl_var task.duration> <tmpl_var task.duration.units></td>
-	     <td align="center" style="height:20px"><tmpl_var task.start></td>
-	     <td align="center" style="height:20px"><tmpl_var task.end></td>
-	     <td align="center" style="height:20px"><tmpl_var task.dependants></td>	
-	     <tmpl_var task.lagTime>
-      </tr>
-      </tmpl_loop>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-   </tbody>
-</table>
-<tmpl_var form.footer>
-
-<div id="links">
-<!-- 	<tmpl_if project.canEdit><a href="<tmpl_var task.resources.url>"><tmpl_var task.resources.label></a>&nbsp;|&nbsp;</tmpl_if> -->
-	<tmpl_if task.canAdd><a href="<tmpl_var task.add.url>" class="submodal-400-300"><tmpl_var task.add.label></a>&nbsp;|&nbsp;</tmpl_if>
-	<a href="<tmpl_var task.back.url>"><tmpl_var task.back.label></a>
-</div>
-
-~~~
-
-<style type="text/css">
-	body, html {
-		margin:0px;
-		padding:0px;
-	}
-	.project {
-		position:relative;
-		margin-top:5px;
-		margin-left:5px;
-	}
-	.project td {
-		border:solid silver 1px;
-		border-bottom:solid gray 1px;
-		font-size:9pt;
-		font-family:arial;		
-	}
-	.project a {
-	    color:#000000;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.project a:hover {
-	    color:#7AB7E9;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.taskname {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 295px;
-    }
-	.taskduration {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 25px;
-	}
-	.taskdate {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 68px;
-	}
-	.taskdependant {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 20px;
-	}
-	tr.monthNames td {		
-		text-align:center;		
-	}
-	tr.dates td {
-		width:16px;
-	}
-	div.scroller {		
-		overflow:scroll;		
-		position:relative;
-		width:400px;		
-	}
-	
-	* html div.scroller {
-		overflow-x:scroll;
-	}
-	
-	td.empty {
-		background-color:transparent;
-		border-style:none;
-		height:20px;
-	}
-	
-	div.barPositions {
-		position:relative;
-	}
-	div.projectBar {
-		position:absolute;
-		height:10px;
-		z-index:2;
-		padding:0px;
-		margin:0px;
-		font-size:1pt;
-	}
-	div.statusBar {	
-		background-color:#000;
-		position:absolute;	
-		height:5px;
-		z-index:3;
-		padding:0px;
-		top:2px;
-		margin:0px;		
-		font-size:1pt;		
-	}
-	
-	div.projectLineH {		
-		background: url('images/dot.gif') top repeat-x;		
-		font-size:1pt;
-		text-align:right;
-		position:absolute;
-	}		
-	div.projectLineV {
-		width:1px;
-		background-color:black;
-		position:relative;
-		font-size:1pt;	
-		height:100%;
-		float:right;
-	}
-	
-	div.projectLabel {
-		position:absolute;
-		margin-top:-3px;
-		white-space:nowrap;
-		font-family: verdana;
-		font-size:8px;
-	}
-	
-	div.milestone {
-		color:#000000;
-		position:absolute;
-		z-index:4;
-		margin:0px;
-		padding:0px;		
-		margin-top:-3px;
-		font-size: 10px;
-		font-family: times;
-	}
-	
-	#links {
-		margin-top:7px;
-		margin-left:5px;
-		font-family:arial;
-		font-size:9pt;
-	}
-	
-	#links a {
-		color:#7AB7E9;
-	}
-</style>
-
-<style>
-.popUp {
-			width:100%;
-			border:solid black 0px;
-			background-color:#F5F5F5;
-		}
-		.popUp td {
-			font-size:9pt;	
-			font-family:arial;
-			border-top:solid #E0E0E0 1px;
-		}	
-		.popUp tr.clear td {
-			border-style:none;
-			background-color:#F0F0F0;
-		}
-		.popUp tr.clearNoBG td {
-			border-style:none;
-		}
-		.popUp td.header {
-			font-weight:bold;
-		}
-		.popUp td span.header {
-			font-weight:bold;
-		}
-		a.saveBtn {
-			width:40px;
-			height:15px;
-			background-color:silver;
-			padding:1px;
-			padding-left:5px;
-			padding-right:5px;
-			color:white;
-			border:solid gray 1px;
-			text-decoration:none;
-			font-weight:bold;
-			display:block;
-			float:right;
-			text-align:center;
-		}
-		a.saveBtn:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-</style>
diff --git a/docs/upgrades/templates-7.0.7/project_manager_resource_list.tmpl b/docs/upgrades/templates-7.0.7/project_manager_resource_list.tmpl
deleted file mode 100644
index 41ed62768..000000000
--- a/docs/upgrades/templates-7.0.7/project_manager_resource_list.tmpl
+++ /dev/null
@@ -1,21 +0,0 @@
-#ProjectManagerTMPL0006
-#create
-#namespace:ProjectManager_resourceList
-#url:default-pm-resource-list
-#title:Default Resource List
-#menuTitle:Default Resource List
-
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-<tmpl_loop resourceLoop>
-  <tr <tmpl_if odd>class="odd"</tmpl_if>>
-    <td><img src="<tmpl_var assetExtras>/<tmpl_var resourceIcon>"></td>
-    <td><tmpl_if hiddenFields>
-          <input type="hidden" class="taskEdit_resourceList_hidden"
-                 name="resources" value="<tmpl_var resourceKind> <tmpl_var resourceId>" />
-        </tmpl_if><tmpl_var resourceName></td>
-    <td><tmpl_if opCallbackJs>
-          <a href="javascript:<tmpl_var opCallbackJs>('<tmpl_var resourceKind>', '<tmpl_var resourceId>')"><img src="<tmpl_var assetExtras>/<tmpl_var opIcon>" style="border-style:none;" alt="<tmpl_var opTitle>" title="<tmpl_var opTitle>" /></a>
-        </tmpl_if></td>
-  </tr>
-</tmpl_loop>
-</table>
diff --git a/docs/upgrades/templates-7.0.7/project_manager_resource_popup.tmpl b/docs/upgrades/templates-7.0.7/project_manager_resource_popup.tmpl
deleted file mode 100644
index 5e2adb6e2..000000000
--- a/docs/upgrades/templates-7.0.7/project_manager_resource_popup.tmpl
+++ /dev/null
@@ -1,65 +0,0 @@
-#ProjectManagerTMPL0005
-#create
-#namespace:ProjectManager_resourcePopup
-#url:default-pm-resource-popup
-#title:Default Resource Popup
-#menuTitle:Default Resource Popup
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html><head>
-<title><tmpl_var title></title>
-<script type="text/javascript">
-function searchPopup_itemSelected(kind, id) {
-	window.close();
-	opener.<tmpl_var callback>(kind, id);
-}
-</script>
-<style type="text/css">
-html, body {
-	font-family: arial;
-	font-size: 9pt;
-	color: black;
-	background-color: white;
-}
-.searchBtn {
-	background-color:silver;
-	color:white;
-	border:solid gray 1px;
-	text-decoration:none;
-	font-weight:bold;	
-	text-align:center;
-	cursor:pointer;
-	font-size:9pt;
-}
-.inputBox {
-	border:solid gray 1px;
-	font-size:9pt;
-}
-.grayArea {
-	background-color:#F2F2F2;
-	border:solid #E8E8E8 1px;
-	padding:3px;
-	-moz-box-sizing:border-box;
-}
-</style>
-<link rel="stylesheet" href="<tmpl_var assetExtras>/taskEdit.css" />
-<style type="text/css">
-#taskEdit_resourceList_div {
-	height: auto;
-}
-</style>
-</head><body>
-<form method="GET" action="<tmpl_var selfUrl>">
-<input type="hidden" name="func" value="<tmpl_var func>" />
-<input type="hidden" name="doSearch" value="1" />
-<input type="hidden" name="callback" value="<tmpl_var callback>" />
-<input type="hidden" name="exclude" value="<tmpl_var exclude>" />
-<div class="grayArea">
-<b><tmpl_var searchText></b><br /><input type="text" name="search" value="<tmpl_var previousSearch>" size="20" class="inputBox" />
-<input type="submit" value="Search" class="searchBtn" /></form>
-</div>
-
-<tmpl_if doingSearch><tmpl_if foundResults><p><tmpl_var foundMessage></p><tmpl_var resourceDiv>
-<tmpl_else><p><tmpl_var notFoundMessage></p></tmpl_if></tmpl_if>
-</body></html>
diff --git a/docs/upgrades/templates-7.0.7/stockdata.tmpl b/docs/upgrades/templates-7.0.7/stockdata.tmpl
deleted file mode 100644
index 2d7bc6e8d..000000000
--- a/docs/upgrades/templates-7.0.7/stockdata.tmpl
+++ /dev/null
@@ -1,97 +0,0 @@
-#StockDataTMPL000000001
-
-<a name="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>
-
-<table cellpadding="0" cellspacing="0" border="0" class="qmmt_main" width="100%">
-   <tr>
-      <td colspan="3" style="text-align: left">  
-	     <div class="qmmt_header_bar" style="padding-top: 1px; padding-bottom: 1px; border-bottom-width: 1px;">
-		    <table cellpadding="0" cellspacing="0" border="0" width="100%">   
-			  <tr>
-			     <td class="qmmt_header_text">Stock Watch</td>
-				 <td class="qmmt_header_text" style="text-align: right; padding-right: 3px; font-weight: normal;">
-				    <div id="qm_textChange_7310">
-					   <span class="qmmt_header_text" style="font-weight:normal;"><b>Last Update: </b> <tmpl_var lastUpdate.default> EDT</span></div>
-					      <script type="text/javascript">
-//<![CDATA[
-
-						     function qm_UpdateText_7310(phase){    
-							   switch (phase)    {        
-							      case 1: document.getElementById('qm_textChange_7310').innerHTML = '<span class="qmmt_header_text" style="font-weight:normal;">delayed 20 minutes</span>'; 
-                                   setTimeout("qm_UpdateText_7310(2)", 5000); 
-								   break;        
-								  case 2: document.getElementById('qm_textChange_7310').innerHTML = '<span class="qmmt_header_text" style="font-weight:normal;"><b>Last Update:&nbsp;</b> <tmpl_var lastUpdate.default> EDT</span>'; 
-                                   setTimeout("qm_UpdateText_7310(3)", 5000); 
-								   break;        
-								  case 3: document.getElementById('qm_textChange_7310').innerHTML = '<a href="http://www.quotemedia.com/" style="text-decoration:none;"><span class="qmmt_header_text" style="font-weight:normal;">Yahoo Finance</span></a>';
-                                   setTimeout("qm_UpdateText_7310(1)", 5000); 
-								   break;        
-								}        
-							 }
-							 qm_UpdateText_7310(2);
-//]]>
-						 </script> 
-				  </td>       
-				</tr>  
-		     </table>  
-	      </div>  
-	   </td> 
-	</tr>  
-	<tr>  
-	   <td>       
-	      <script type="text/javascript">
-//<![CDATA[
-		     function openDetail_2961(symbol) {     
-			    var w = 670;   
-				var h = 286;   
-				var winl = (screen.width - w) / 2;   
-				var wint = (screen.height - h) / 2;   
-			    var winprops ='height='+h+',width='+w+',top='+wint+',left='+winl+',toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=0,resizable=1';   
-				win = window.open("<tmpl_var stock.display.url>" + escape(symbol), "DetailedQuote", winprops);
-				if (parseInt(navigator.appVersion) >= 4) {       
-				   win.window.focus();   
-				}   
-		      }
-//]]>
-		   </script>    
-		   <table cellpadding="0" cellspacing="0" style="padding: 2px;" width="100%">   
-		      <tr class="qmmt_main">
-			     <td class="qmmt_text" style="font-weight: bold; text-align: left; padding-left: 3px;white-space:nowrap;"> Name </td>        
-				 <td class="qmmt_text" style="font-weight: bold; text-align: left; padding-left: 3px; white-space:nowrap;width:8%;">Symbol</td>    
-				 <td class="qmmt_text" style="font-weight: bold; text-align: right; white-space:nowrap;width:9%;">Last</td>
-				 <td class="qmmt_text" style="font-weight: bold; text-align: center; white-space:nowrap;width:4%">Tick</td>        
-				 <td class="qmmt_text" style="font-weight: bold; text-align: right; white-space:nowrap; width:7%;">Chg</td>         
-	          </tr>
-			  <tmpl_loop stocks.loop>
-			     <tr class='<tmpl_if __ODD__>qmmt_cycle<tmpl_else>qmmt_main</tmpl_if>'>            
-			        <td class="qmmt_text" style="padding-left: 3px;white-space:nowrap;"><tmpl_var stocks.name></td>
-				    <td class="qmmt_text" style="text-align: left; padding-left: 3px;white-space:nowrap;">
-				       <a class="qmmt" style="text-decoration: none;" href="javascript:openDetail_2961('<tmpl_var stocks.symbol>')"><tmpl_var stocks.symbol></a>
-			        </td>        
-				    <td class="qmmt_text" style="text-align: right;white-space:nowrap;"><tmpl_var stocks.last></td>
-				    <td class="qmmt_text" style="text-align: center;white-space:nowrap;" align="right">
-					   <img src="<tmpl_var extrasFolder>/<tmpl_var stocks.net.icon>" alt="" />            
-				    </td>
-				    <td class="qmmt_text<tmpl_if stocks.net.isUp>_up<tmpl_else><tmpl_if stocks.net.isDown>_down</tmpl_if></tmpl_if>" style="text-align: right;whitespace:nowrap;"><tmpl_var stocks.net></td>
-			     </tr>          
-			  </tmpl_loop>  
-			</table>      
-	     </td> 
-	  </tr>
-  </table>
-
-~~~
-
-<link rel="stylesheet" type="text/css" href="^Extras;wobject/StockData/tools.css" />
diff --git a/docs/upgrades/templates-7.0.8/default_thread.tmpl b/docs/upgrades/templates-7.0.8/default_thread.tmpl
deleted file mode 100644
index 496169eaf..000000000
--- a/docs/upgrades/templates-7.0.8/default_thread.tmpl
+++ /dev/null
@@ -1,123 +0,0 @@
-#PBtmpl0000000000000032
-
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
-
-<tmpl_if session.var.adminOn> 
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-	
-<div style="float: left; width: 70%">
-	<h2><a href="<tmpl_var collaboration.url>"><tmpl_var collaboration.title></a></h2>
-</div>
-<div style="width: 30%; float: left; text-align: right;">
-	<tmpl_if layout.isFlat>
-		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
-	<tmpl_else>
-		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
-	</tmpl_if>
-</div>
-<div style="clear: both;"></div>
-
-<tmpl_loop post_loop>
-	<tmpl_if layout.isNested><div style="margin-left: <tmpl_var depthX10>px;"></tmpl_if>
-		<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
-			<a name="id<tmpl_var assetId>"></a>
-			<div class="postSubject">
-				<tmpl_var title>
-			</div>
-			<div class="postData">
-<tmpl_if avatar.url>
-<div style="float: left; padding-right: 10px;">
-<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
-</div>
-</tmpl_if>
-				<div style="float: left; padding-right: 25px;">
-					<b><tmpl_var user.label>:</b> 
-						<tmpl_if user.isVisitor>
-							<tmpl_var username>
-						<tmpl_else>
-							<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
-						</tmpl_if>
-						<br />
-					<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
-				</div>	
-				<div>
-					<b><tmpl_var views.label>:</b> <tmpl_var views><br />
-					<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-						<tmpl_unless hasRated>
-							&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
-						</tmpl_unless>
-						<br />
-						<tmpl_if user.isPoster>
-							<b><tmpl_var status.label>:</b> <tmpl_var status> [ <tmpl_if isArchived> <a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
-						</tmpl_if>	
-				</div>	
-			</div>
-			<div class="postMessage">
-				<tmpl_var content>
-<tmpl_loop attachment_loop>
-	<div style="float: left; padding: 5px;">
-		<a href="<tmpl_var url>">
-			<tmpl_if isImage>
-				<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
-			<tmpl_else>
-				<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
-			</tmpl_if>
-		</a>
-	</div>
-</tmpl_loop>
-<div style="clear: both;"></div>
-
-			</div>
-			<tmpl_unless isLocked>
-				<div class="postControls">
-					<tmpl_if user.canReply>
-						<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull;
-					</tmpl_if>
-					<tmpl_if user.canEdit>
-						<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
-						<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-					</tmpl_if>
-				</div>
-			</tmpl_unless>
-		</div>
-	<tmpl_if layout.isNested></div></tmpl_if>
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination" style="margin-top: 20px;">
-		[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
-	</div>
-</tmpl_if>
-
-<div style="margin-top: 20px;" class="bottomControls">
-	<tmpl_if previous.url>
-		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> &bull;
-	</tmpl_if>	
-	<tmpl_if next.url>
-		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> &bull; 
-	</tmpl_if>	
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<tmpl_if isSticky>
-			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a> &bull;
-		<tmpl_else>
-			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a> &bull;
-		</tmpl_if>
-		<tmpl_if isLocked>
-			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a> &bull;
-		<tmpl_else>
-			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a> &bull;
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-	</tmpl_unless>
-</div>
diff --git a/docs/upgrades/templates-7.0.8/weather_data.tmpl b/docs/upgrades/templates-7.0.8/weather_data.tmpl
deleted file mode 100644
index 2be358323..000000000
--- a/docs/upgrades/templates-7.0.8/weather_data.tmpl
+++ /dev/null
@@ -1,41 +0,0 @@
-#WeatherDataTmpl0000001
-
-<a name="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></p>
-</tmpl_if>
-
-<tmpl_loop ourLocations.loop>
-<table border="0" width="100%">
-<tr>
-        <td rowspan="3" style="width:55px;"><img src="<tmpl_var iconUrl>" alt="<tmpl_var iconAlt>" /></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>
\ No newline at end of file
diff --git a/docs/upgrades/templates-7.0.9/default_article.tmpl b/docs/upgrades/templates-7.0.9/default_article.tmpl
deleted file mode 100644
index 29f1a6340..000000000
--- a/docs/upgrades/templates-7.0.9/default_article.tmpl
+++ /dev/null
@@ -1,46 +0,0 @@
-#PBtmpl0000000000000002
-
-<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 pagination.isFirstPage>
-<tmpl_if image.url>
-	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td class="content">
-	<img src="<tmpl_var image.url>" align="right" border="0" alt="<tmpl_var image.url>" />
-</tmpl_if>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<tmpl_if pagination.isLastPage>
-	<tmpl_if linkUrl>
-	<tmpl_if linkTitle>
-		<p />
-		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
-	</tmpl_if>
-	</tmpl_if>
-	<tmpl_if attachment.name><p><p style="display:inline;vertical-align:middle;"><a href="<tmpl_var attachment.url>"><img src="<tmpl_var attachment.icon>" style="vertical-align:middle;border: 0px;" alt="<tmpl_var attachment.name>" /> <tmpl_var attachment.name></a></p></p></tmpl_if>
-</tmpl_if>
-
-<tmpl_if pagination.pageCount.isMultiple>
-<tmpl_var pagination.previousPage>
-&#183;
-<tmpl_var pagination.pageList.upTo20>
-&#183;
-<tmpl_var pagination.nextPage>
-</tmpl_if>
-
-<tmpl_if pagination.isFirstPage>
-<tmpl_if image.url>
-	</td></tr></table>
-</tmpl_if>
-</tmpl_if>
diff --git a/docs/upgrades/templates-7.0.9/default_edit_task.tmpl b/docs/upgrades/templates-7.0.9/default_edit_task.tmpl
deleted file mode 100644
index 745d28ce6..000000000
--- a/docs/upgrades/templates-7.0.9/default_edit_task.tmpl
+++ /dev/null
@@ -1,79 +0,0 @@
-#ProjectManagerTMPL0004
-
-<tmpl_var form.header>
-<table class="popUp" cellspacing="0" cellpadding="3" border="0">
-<tbody>
-<tr>
-        <td align="right" style="width:25%;" class="header">Task Name&nbsp;</td>
-        <td style="width:75%;"><tmpl_var form.name></td>
-</tr>
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clear">
-                        <td style="width:25%;" align="right" class="header">Start&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.start></td>
-                        <td style="width:25%;" align="right" class="header">Finish&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.end></td>
-                </tr><tr class="clear">
-			<td style="width:100%; text-align: center" colspan="4" class="header"><tmpl_var form.taskType></td>
-		</tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clear">
-                        <td style="width:25%; text-align:right" class="header">Duration&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.duration>&nbsp;<tmpl_var form.duration.units></td>
-                        <td style="width:25%; text-align:right" class="header">Lag Time&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.lagTime>&nbsp;<tmpl_var form.lagTime.units></td>
-                </tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clear">
-                        <td style="width:25%;" align="right" class="header">Predecessor&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.dependants></td>
-                        <td style="width:25%;" align="right" class="header">% Complete&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.percentComplete></td>
-                </tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clearNoBG" style="text-align:center;">
-                        <td style="text-align:left;">
-                           <span class="header">Resources:</span><br /><br />
-                           <span style="margin-bottom:2px;padding-bottom:2px;padding-left:5px;-moz-box-sizing:border-box;display:block;">
-                              <a style="text-decoration:none;" id="<tmpl_var form.addUser.id>" href="<tmpl_var form.addUser.link>" target="_new" onclick="taskEdit_searchPopup(this.href); return false;"><img style="border-style:none;vertical-align:middle;" title="<tmpl_var form.addUser.text>" alt="<tmpl_var form.addUser.text>" src="<tmpl_var assetExtras>/users.gif" /><span style="text-decoration:none;font-size:8pt;"> Add User To Task</span></a>&nbsp;&nbsp;&nbsp;&nbsp;
-                              <a style="text-decoration:none;" id="<tmpl_var form.addGroup.id>" href="<tmpl_var form.addGroup.link>" target="_new" onclick="taskEdit_searchPopup(this.href); return false;"><img style="border-style:none;vertical-align:middle;" title="<tmpl_var form.addGroup.text>" alt="<tmpl_var form.addGroup.text>" src="<tmpl_var assetExtras>/groups.gif" /><span style="text-decoration:none;font-size:8pt;"> Add Group to Task</span></a>
-                           </span><tmpl_var form.resourceDiv>
-                        </td>
-                </tr>
-                <tr>
-                        <td style="text-align:right;" class="header"><a href="javascript:void(checkEditTaskForm(document.editTaskForm))" class="saveBtn">Save</a></td>
-                </tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-
-
-</tbody>
-</table>
-<tmpl_var form.footer>
diff --git a/docs/upgrades/templates-7.0.9/default_gantt_chart.tmpl b/docs/upgrades/templates-7.0.9/default_gantt_chart.tmpl
deleted file mode 100644
index 13c01eb43..000000000
--- a/docs/upgrades/templates-7.0.9/default_gantt_chart.tmpl
+++ /dev/null
@@ -1,43 +0,0 @@
-#ProjectManagerTMPL0003
-
-<script type="text/javascript">
-	taskArray=<tmpl_var project.task.array>;
-</script>
-<div class="barPositions">
-	<tmpl_loop task.div.loop>
-	<tmpl_if task.isUntimed>      
-		<div class="milestone" style="left:<tmpl_var task.div.left>px;top:<tmpl_var task.div.top>px;">&diams;</div>
-	</tmpl_if><tmpl_if task.hasDuration>
-		<div class="projectBar" style="left:<tmpl_var task.div.left>px;top:<tmpl_var task.div.top>px;width:<tmpl_var task.div.width>px;background-color:<tmpl_var task.div.color>">
-		<div class="statusBar" style="width:<tmpl_var task.div.percentComplete>%;"></div>
-		<tmpl_if task.hasPredecessor>   
-			<div class="projectLineH" style="top:4px;left:50px;width:75px;height:28px;"><div class="projectLineV"></div></div>
-	        </tmpl_if>
-	        <tmpl_if task.hasResource>
-			<div class="projectLabel" style="left:<tmpl_var task.div.label.left>px;top:3px;margin-top:-3px;"><tmpl_var task.resource.name></div>
-	        </tmpl_if> 
-		</div>
-	</tmpl_if>
-   </tmpl_loop>
-   <a name="<tmpl_var project.table.width>" id="projectTableWidth"></a>
-   <a name="<tmpl_var project.scroll.percentWidth>" id="projectScrollPercentWidth"></a>
-   <table cellpadding="0" cellspacing="0" border="0" style="width:<tmpl_var scrollWidth>px;z-index:1;">
-      <tr class="monthNames">
-	     <tmpl_loop months.loop>
-		    <td colspan="<tmpl_var month.colspan>" class="monthName" style="height:20px;"><tmpl_var month.name></td>
-		 </tmpl_loop>
-	  </tr>	
-	  <tr class="dates">
-	     <tmpl_loop days.loop>
-		    <td  align="center" style="width:23px"><tmpl_var day.number></td>
-		 </tmpl_loop>
-	  </tr>
-	  <tmpl_loop task.count.loop>
-	     <tr>
-		    <td colspan="<tmpl_var total.colspan>" class="empty" style="height:21px;">&nbsp;</td>
-	     </tr>
-	  </tmpl_loop>
-   </table>
-   <br />
-</div>
-
diff --git a/docs/upgrades/templates-7.0.9/default_project_display.tmpl b/docs/upgrades/templates-7.0.9/default_project_display.tmpl
deleted file mode 100644
index 2d1e24d45..000000000
--- a/docs/upgrades/templates-7.0.9/default_project_display.tmpl
+++ /dev/null
@@ -1,274 +0,0 @@
-#ProjectManagerTMPL0002
-
-<script type="text/javascript">
-//<![CDATA[
-dunits = "<tmpl_var project.durationUnits>";
-hoursPerDay = <tmpl_var project.hoursPerDay>;
-taskLength = <tmpl_var project.task.length>;
-extrasPath = '<tmpl_var extras>';
-errorMsgs = {
-   'name' : "<tmpl_var form.name.error>",
-   'start' : "<tmpl_var form.start.error>",
-   'end' : "<tmpl_var form.end.error>",
-   'greaterthan' : "<tmpl_var form.greaterthan.error>",
-   'invalidMove' : "<tmpl_var form.invalidMove.error>",
-   'noPredecessor' : "<tmpl_var form.noPredecessor.error>",
-   'samePredecessor' : "<tmpl_var form.samePredecessor.error>",
-   'previousPredecessor' : "<tmpl_var form.previousPredecessor.error>",
-   'untimedPredecessor' : "<tmpl_var form.untimedPredecessor.error>"
-};
-
-addEvent(window, "load", initPopUp);
-//]]>
-</script>
-<tmpl_var form.header>
-<table cellpadding="0" cellspacing="0" border="0" class="project" id="mastertable" style="width:<tmpl_var project.table.width>px;">
-   <tbody>
-      <tr>
-         <td style="width:20px;height:20px;">&nbsp;</td>
-	     <td style="width:300px;" align="center">Task Name</td>
-	     <td style="width:70px;" align="center">Duration</td>
-	     <td style="width:70px;" align="center">Start</td>
-	     <td style="width:70px;" align="center">Finish</td>
-	     <td style="width:30px;" align="center">Pred</td>
-	     <td rowspan="<tmpl_var project.gantt.rowspan>" valign="top" id="scrolltd" style="border-style:none;width:<tmpl_var project.scroll.percentWidth>%;">
-	        <div class="scroller" id="gantt">
-			   <tmpl_var project.ganttChart>
-		    </div>
-	     </td>
-      </tr>
-      <tr>
-	     <td colspan="6">&nbsp;</td>
-      </tr>
-      <tmpl_loop task.loop>
-      <tr id="<tmpl_var task.row.id>">
-	     <td align="center" style="height:20px"><tmpl_var task.number></td>
-	     <td align="left" style="height:20px">
-	        <tmpl_if task.canAdd>
-		       <script type="text/javascript">
-			   //<![CDATA[
-                   var cMenu = new cMenu_createWithLink("id_<tmpl_var task.number>","<tmpl_var task.name>");
-				   cMenu.addLink("<tmpl_var task.edit.url>","<tmpl_var task.edit.label>");
-				   cMenu.addLink("<tmpl_var task.insertAbove.url>","<tmpl_var task.insertAbove.label>");
-				   cMenu.addLink("<tmpl_var task.insertBelow.url>","<tmpl_var task.insertBelow.label>");
-				   cMenu.addLink("<tmpl_var task.delete.url>","<tmpl_var task.delete.label>");
-				   cMenu.print();
-				//]]>
-               </script>
-			   <!-- <a href="<tmpl_var task.edit.url>" class="submodal-400-350"><tmpl_var task.name></a> -->
-		    <tmpl_else>
-		       <tmpl_var task.name>
-		    </tmpl_if>
-	     </td>
-	     <td align="center" style="height:20px"><tmpl_var task.duration> <tmpl_var task.duration.units></td>
-	     <td align="center" style="height:20px"><tmpl_var task.start></td>
-	     <td align="center" style="height:20px"><tmpl_var task.end></td>
-	     <td align="center" style="height:20px"><tmpl_var task.dependants></td>	
-	     <tmpl_var task.lagTime>
-      </tr>
-      </tmpl_loop>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-   </tbody>
-</table>
-<tmpl_var form.footer>
-
-<div id="links">
-<!-- 	<tmpl_if project.canEdit><a href="<tmpl_var task.resources.url>"><tmpl_var task.resources.label></a>&nbsp;|&nbsp;</tmpl_if> -->
-	<tmpl_if task.canAdd><a href="<tmpl_var task.add.url>" class="submodal-400-300"><tmpl_var task.add.label></a>&nbsp;|&nbsp;</tmpl_if>
-	<a href="<tmpl_var task.back.url>"><tmpl_var task.back.label></a>
-</div>
-
-~~~
-<style type="text/css">
-	body, html {
-		margin:0px;
-		padding:0px;
-	}
-	.project {
-		position:relative;
-		margin-top:5px;
-		margin-left:5px;
-	}
-	.project td {
-		border:solid silver 1px;
-		border-bottom:solid gray 1px;
-		font-size:9pt;
-		font-family:arial;		
-	}
-	.project a {
-	    color:#000000;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.project a:hover {
-	    color:#7AB7E9;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.taskname {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 295px;
-    }
-	.taskduration {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 25px;
-	}
-	.taskdate {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 68px;
-	}
-	.taskdependant {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 20px;
-	}
-	tr.monthNames td {		
-		text-align:center;		
-	}
-	tr.dates td {
-		width:16px;
-	}
-	div.scroller {		
-		overflow:scroll;		
-		position:relative;
-		width:400px;		
-	}
-	
-	* html div.scroller {
-		overflow-x:scroll;
-	}
-	
-	td.empty {
-		background-color:transparent;
-		border-style:none;
-		height:20px;
-	}
-	
-	div.barPositions {
-		position:relative;
-	}
-	div.projectBar {
-		position:absolute;
-		height:10px;
-		z-index:2;
-		padding:0px;
-		margin:0px;
-		font-size:1pt;
-	}
-	div.statusBar {	
-		background-color:#000;
-		position:absolute;	
-		height:5px;
-		z-index:3;
-		padding:0px;
-		top:2px;
-		margin:0px;		
-		font-size:1pt;		
-	}
-	
-	div.projectLineH {		
-		background: url('images/dot.gif') top repeat-x;		
-		font-size:1pt;
-		text-align:right;
-		position:absolute;
-	}		
-	div.projectLineV {
-		width:1px;
-		background-color:black;
-		position:relative;
-		font-size:1pt;	
-		height:100%;
-		float:right;
-	}
-	
-	div.projectLabel {
-		position:absolute;
-		margin-top:-3px;
-		white-space:nowrap;
-		font-family: verdana;
-		font-size:8px;
-	}
-	
-	div.milestone {
-		color:#000000;
-		position:absolute;
-		z-index:4;
-		margin:0px;
-		padding:0px;		
-		margin-top:-3px;
-		font-size: 10px;
-		font-family: times;
-	}
-	
-	#links {
-		margin-top:7px;
-		margin-left:5px;
-		font-family:arial;
-		font-size:9pt;
-	}
-	
-	#links a {
-		color:#7AB7E9;
-	}
-</style>
-
-<style>
-.popUp {
-			width:100%;
-			border:solid black 0px;
-			background-color:#F5F5F5;
-		}
-		.popUp td {
-			font-size:9pt;	
-			font-family:arial;
-			border-top:solid #E0E0E0 1px;
-		}	
-		.popUp tr.clear td {
-			border-style:none;
-			background-color:#F0F0F0;
-		}
-		.popUp tr.clearNoBG td {
-			border-style:none;
-		}
-		.popUp td.header {
-			font-weight:bold;
-		}
-		.popUp td span.header {
-			font-weight:bold;
-		}
-		a.saveBtn {
-			width:40px;
-			height:15px;
-			background-color:silver;
-			padding:1px;
-			padding-left:5px;
-			padding-right:5px;
-			color:white;
-			border:solid gray 1px;
-			text-decoration:none;
-			font-weight:bold;
-			display:block;
-			float:right;
-			text-align:center;
-		}
-		a.saveBtn:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-</style>
diff --git a/docs/upgrades/templates-7.1.0/SQLReport-Download.tmpl b/docs/upgrades/templates-7.1.0/SQLReport-Download.tmpl
deleted file mode 100644
index c726c0ecb..000000000
--- a/docs/upgrades/templates-7.1.0/SQLReport-Download.tmpl
+++ /dev/null
@@ -1,129 +0,0 @@
-#SQLReportDownload0001
-#namespace:SQLReport/Download
-#title:SQLReport Download Default Template
-<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-<tr>
-<tmpl_loop columns_loop>
-	<td class="tableHeader"><tmpl_var column.name></td>
-</tmpl_loop>
-</tr>
-<tmpl_loop rows_loop>
-	<tr>
-	<tmpl_loop row.field_loop>
-		<td class="tableData"><tmpl_var field.value></td>
-	</tmpl_loop>
-	</tr>
-	<!-- Handle nested query2 -->
-	<tmpl_if hasNest>
-		<tr>
-		<td colspan="<tmpl_var columns.count>">
-		<table width="100%" cellspacing="0" cellpadding="0">
-		<tr>
-		<td width="20">&nbsp;</td>
-		<td>
-		<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-		<tr>
-		<tmpl_loop query2.columns_loop>
-			<td class="tableHeader"><tmpl_var column.name></td>
-		</tmpl_loop>
-		</tr>
-		<tmpl_loop query2.rows_loop>
-			<tr>
-			<tmpl_loop query2.row.field_loop>
-				<td class="tableData"><tmpl_var field.value></td>
-			</tmpl_loop>
-			</tr>
-			<!-- Handle nested query3 -->
-			<tmpl_if query2.hasNest>
-				<tr>
-				<td colspan="<tmpl_var query2.columns.count>">
-				<table width="100%" cellspacing="0" cellpadding="0">
-				<tr>
-				<td style="width:20px;">&nbsp;</td>
-				<td>
-				<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-				<tr>
-				<tmpl_loop query3.columns_loop>
-					<td class="tableHeader"><tmpl_var column.name></td>
-				</tmpl_loop>
-				</tr>
-				<tmpl_loop query3.rows_loop>
-					<tr>
-					<tmpl_loop query3.row.field_loop>
-						<td class="tableData"><tmpl_var field.value></td>
-					</tmpl_loop>
-					</tr>
-		   			<!-- Handle nested query4 -->
-					<tmpl_if query3.hasNest>
-						<tr>
-						<td colspan="<tmpl_var query3.columns.count>">
-						<table width="100%" cellspacing="0" cellpadding="0">
-						<tr>
-						<td style="width:20px;">&nbsp;</td>
-						<td>
-						<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-						<tr>
-						<tmpl_loop query4.columns_loop>
-							<td class="tableHeader"><tmpl_var column.name></td>
-						</tmpl_loop>
-						</tr>
-						<tmpl_loop query4.rows_loop>
-							<tr>
-							<tmpl_loop query4.row.field_loop>
-								<td class="tableData"><tmpl_var field.value></td>
-							</tmpl_loop>
-				   			<!-- Handle nested query5 -->
-							<tmpl_if query4.hasNest>
-								<tr>
-								<td colspan="<tmpl_var query4.columns.count>">
-								<table width="100%" cellspacing="0" cellpadding="0">
-								<tr>
-								<td style="width:20px;">&nbsp;</td>
-								<td>
-								<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-								<tr>
-								<tmpl_loop query5.columns_loop>
-									<td class="tableHeader"><tmpl_var column.name></td>
-								</tmpl_loop>
-								</tr>
-								<tmpl_loop query5.rows_loop>
-									<tr>
-									<tmpl_loop query5.row.field_loop>
-										<td class="tableData"><tmpl_var field.value></td>
-									</tmpl_loop>
-									</tr>
-								</tmpl_loop>
-								</table>
-								</td>
-								</tr>
-								</table>
-						        	</td>
-				        			</tr>
-							</tmpl_if>
-							</tr>
-						</tmpl_loop>
-						</table>
-						</td>
-						</tr>
-						</table>
-				        	</td>
-				        	</tr>
-					</tmpl_if>
-				</tmpl_loop>
-				</table>
-				</td>
-				</tr>
-				</table>
-			        </td>
-			        </tr>
-			</tmpl_if>
-		</tmpl_loop>
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-	</tmpl_if>
-</tmpl_loop>
-</table>
diff --git a/docs/upgrades/templates-7.1.0/SQLReport.tmpl b/docs/upgrades/templates-7.1.0/SQLReport.tmpl
deleted file mode 100644
index 4372dac7a..000000000
--- a/docs/upgrades/templates-7.1.0/SQLReport.tmpl
+++ /dev/null
@@ -1,161 +0,0 @@
-#PBtmpl0000000000000059
-<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 canDownload>
-	<a href="/<tmpl_var url>?func=download">Download this data</a>
-</tmpl_if>
-
-<tmpl_if debugMode>
-	<ul>
-	<tmpl_loop debug_loop>
-		<li><tmpl_var debug.output></li>
-	</tmpl_loop>
-	</ul>
-</tmpl_if>
-
-<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-<tr>
-<tmpl_loop columns_loop>
-	<td class="tableHeader"><tmpl_var column.name></td>
-</tmpl_loop>
-</tr>
-<tmpl_loop rows_loop>
-	<tr>
-	<tmpl_loop row.field_loop>
-		<td class="tableData"><tmpl_var field.value></td>
-	</tmpl_loop>
-	</tr>
-	<!-- Handle nested query2 -->
-	<tmpl_if hasNest>
-		<tr>
-		<td colspan="<tmpl_var columns.count>">
-		<table width="100%" cellspacing="0" cellpadding="0">
-		<tr>
-		<td width="20">&nbsp;</td>
-		<td>
-		<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-		<tr>
-		<tmpl_loop query2.columns_loop>
-			<td class="tableHeader"><tmpl_var column.name></td>
-		</tmpl_loop>
-		</tr>
-		<tmpl_loop query2.rows_loop>
-			<tr>
-			<tmpl_loop query2.row.field_loop>
-				<td class="tableData"><tmpl_var field.value></td>
-			</tmpl_loop>
-			</tr>
-			<!-- Handle nested query3 -->
-			<tmpl_if query2.hasNest>
-				<tr>
-				<td colspan="<tmpl_var query2.columns.count>">
-				<table width="100%" cellspacing="0" cellpadding="0">
-				<tr>
-				<td style="width:20px;">&nbsp;</td>
-				<td>
-				<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-				<tr>
-				<tmpl_loop query3.columns_loop>
-					<td class="tableHeader"><tmpl_var column.name></td>
-				</tmpl_loop>
-				</tr>
-				<tmpl_loop query3.rows_loop>
-					<tr>
-					<tmpl_loop query3.row.field_loop>
-						<td class="tableData"><tmpl_var field.value></td>
-					</tmpl_loop>
-					</tr>
-		   			<!-- Handle nested query4 -->
-					<tmpl_if query3.hasNest>
-						<tr>
-						<td colspan="<tmpl_var query3.columns.count>">
-						<table width="100%" cellspacing="0" cellpadding="0">
-						<tr>
-						<td style="width:20px;">&nbsp;</td>
-						<td>
-						<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-						<tr>
-						<tmpl_loop query4.columns_loop>
-							<td class="tableHeader"><tmpl_var column.name></td>
-						</tmpl_loop>
-						</tr>
-						<tmpl_loop query4.rows_loop>
-							<tr>
-							<tmpl_loop query4.row.field_loop>
-								<td class="tableData"><tmpl_var field.value></td>
-							</tmpl_loop>
-				   			<!-- Handle nested query5 -->
-							<tmpl_if query4.hasNest>
-								<tr>
-								<td colspan="<tmpl_var query4.columns.count>">
-								<table width="100%" cellspacing="0" cellpadding="0">
-								<tr>
-								<td style="width:20px;">&nbsp;</td>
-								<td>
-								<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-								<tr>
-								<tmpl_loop query5.columns_loop>
-									<td class="tableHeader"><tmpl_var column.name></td>
-								</tmpl_loop>
-								</tr>
-								<tmpl_loop query5.rows_loop>
-									<tr>
-									<tmpl_loop query5.row.field_loop>
-										<td class="tableData"><tmpl_var field.value></td>
-									</tmpl_loop>
-									</tr>
-								</tmpl_loop>
-								</table>
-								</td>
-								</tr>
-								</table>
-						        	</td>
-				        			</tr>
-							</tmpl_if>
-							</tr>
-						</tmpl_loop>
-						</table>
-						</td>
-						</tr>
-						</table>
-				        	</td>
-				        	</tr>
-					</tmpl_if>
-				</tmpl_loop>
-				</table>
-				</td>
-				</tr>
-				</table>
-			        </td>
-			        </tr>
-			</tmpl_if>
-		</tmpl_loop>
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-	</tmpl_if>
-</tmpl_loop>
-</table>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> <tmpl_var pagination.pageList.upTo20> <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-
diff --git a/docs/upgrades/templates-7.1.0/default-pm-edit-task.tmpl b/docs/upgrades/templates-7.1.0/default-pm-edit-task.tmpl
deleted file mode 100644
index dda6384a6..000000000
--- a/docs/upgrades/templates-7.1.0/default-pm-edit-task.tmpl
+++ /dev/null
@@ -1,91 +0,0 @@
-#ProjectManagerTMPL0004
-
-<tmpl_var form.header><tmpl_var form.seqNum>
-<table class="popUp" cellspacing="0" cellpadding="3" border="0">
-<tbody>
-<tr>
-        <td align="right" style="width:25%;" class="header">Task Name&nbsp;</td>
-        <td style="width:75%;"><tmpl_var form.name></td>
-</tr>
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clear">
-                        <td style="width:25%;" align="right" class="header">Start&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.start></td>
-                        <td style="width:25%;" align="right" class="header">Finish&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.end></td>
-                </tr><tr class="clear">
-			<td style="width:100%; text-align: center" colspan="4" class="header"><tmpl_var form.taskType></td>
-		</tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clear">
-                        <td style="width:25%; text-align:right" class="header">Duration&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.duration>&nbsp;<tmpl_var form.duration.units></td>
-                        <td style="width:25%; text-align:right" class="header">Lag Time&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.lagTime>&nbsp;<tmpl_var form.lagTime.units></td>
-                </tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clear">
-                        <td style="width:25%;" align="right" class="header">Predecessor&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.dependants></td>
-                        <td style="width:25%;" align="right" class="header">% Complete&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.percentComplete></td>
-                </tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clearNoBG" style="text-align:center;">
-                        <td style="text-align:left;">
-                           <span class="header">Resources:</span><br /><br />
-                           <span style="margin-bottom:2px;padding-bottom:2px;padding-left:5px;-moz-box-sizing:border-box;display:block;">
-                              <a style="text-decoration:none;" id="<tmpl_var form.addUser.id>" href="<tmpl_var form.addUser.link>" target="_new" onclick="taskEdit_searchPopup(this.href); return false;"><img style="border-style:none;vertical-align:middle;" title="<tmpl_var form.addUser.text>" alt="<tmpl_var form.addUser.text>" src="<tmpl_var assetExtras>/users.gif" /><span style="text-decoration:none;font-size:8pt;"> Add User To Task</span></a>&nbsp;&nbsp;&nbsp;&nbsp;
-                              <a style="text-decoration:none;" id="<tmpl_var form.addGroup.id>" href="<tmpl_var form.addGroup.link>" target="_new" onclick="taskEdit_searchPopup(this.href); return false;"><img style="border-style:none;vertical-align:middle;" title="<tmpl_var form.addGroup.text>" alt="<tmpl_var form.addGroup.text>" src="<tmpl_var assetExtras>/groups.gif" /><span style="text-decoration:none;font-size:8pt;"> Add Group to Task</span></a>
-                           </span><tmpl_var form.resourceDiv>
-                        </td>
-                </tr>
-                <tr>
-                        <td style="text-align:right;" class="header"><a href="javascript:void(checkEditTaskForm(document.editTaskForm))" class="saveBtn">Save</a></td>
-                </tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-
-
-</tbody>
-</table>
-<tmpl_var form.footer>
-
-~~~
-
-<style type="text/css">
-.PM_small {
-	font-size:8pt;
-}
-tr.clearNoBG a {
-	text-decoration:none;
-	color:navy;
-}
-</style>
diff --git a/docs/upgrades/templates-7.1.0/default-pm-project-display.tmpl b/docs/upgrades/templates-7.1.0/default-pm-project-display.tmpl
deleted file mode 100644
index a6ca6c50c..000000000
--- a/docs/upgrades/templates-7.1.0/default-pm-project-display.tmpl
+++ /dev/null
@@ -1,275 +0,0 @@
-#ProjectManagerTMPL0002
-
-<script type="text/javascript">
-//<![CDATA[
-dunits = "<tmpl_var project.durationUnits>";
-hoursPerDay = <tmpl_var project.hoursPerDay>;
-taskLength = <tmpl_var project.task.length>;
-extrasPath = '<tmpl_var extras>';
-errorMsgs = {
-   'name' : "<tmpl_var form.name.error>",
-   'start' : "<tmpl_var form.start.error>",
-   'end' : "<tmpl_var form.end.error>",
-   'greaterthan' : "<tmpl_var form.greaterthan.error>",
-   'invalidMove' : "<tmpl_var form.invalidMove.error>",
-   'noPredecessor' : "<tmpl_var form.noPredecessor.error>",
-   'samePredecessor' : "<tmpl_var form.samePredecessor.error>",
-   'previousPredecessor' : "<tmpl_var form.previousPredecessor.error>",
-   'untimedPredecessor' : "<tmpl_var form.untimedPredecessor.error>"
-};
-
-addEvent(window, "load", initPopUp);
-//]]>
-</script>
-<tmpl_var form.header>
-<table cellpadding="0" cellspacing="0" border="0" class="project" id="mastertable" style="width:<tmpl_var project.table.width>px;">
-   <tbody>
-      <tr>
-         <td style="width:20px;height:20px;">&nbsp;</td>
-	     <td style="width:300px;" align="center">Task Name</td>
-	     <td style="width:70px;" align="center">Duration</td>
-	     <td style="width:70px;" align="center">Start</td>
-	     <td style="width:70px;" align="center">Finish</td>
-	     <td style="width:30px;" align="center">Pred</td>
-	     <td rowspan="<tmpl_var project.gantt.rowspan>" valign="top" id="scrolltd" style="border-style:none;width:<tmpl_var project.scroll.percentWidth>%;">
-	        <div class="scroller" id="gantt">
-			   <tmpl_var project.ganttChart>
-		    </div>
-	     </td>
-      </tr>
-      <tr>
-	     <td colspan="6">&nbsp;</td>
-      </tr>
-      <tmpl_loop task.loop>
-      <tr id="<tmpl_var task.row.id>">
-	     <td align="center" style="height:20px"><tmpl_var task.number></td>
-	     <td align="left" style="height:20px">
-	        <tmpl_if task.canAdd>
-		       <script type="text/javascript">
-			   //<![CDATA[
-                   var cMenu = new cMenu_createWithLink("id_<tmpl_var task.number>","<tmpl_var task.name>");
-				   cMenu.addLink("<tmpl_var task.edit.url>","<tmpl_var task.edit.label>");
-				   cMenu.addLink("<tmpl_var task.insertAbove.url>","<tmpl_var task.insertAbove.label>");
-				   cMenu.addLink("<tmpl_var task.insertBelow.url>","<tmpl_var task.insertBelow.label>");
-				   cMenu.addLink("<tmpl_var task.delete.url>","<tmpl_var task.delete.label>");
-				   cMenu.print();
-				//]]>
-               </script>
-			   <!-- <a href="<tmpl_var task.edit.url>" class="submodal-400-350"><tmpl_var task.name></a> -->
-		    <tmpl_else>
-		       <tmpl_var task.name>
-		    </tmpl_if>
-	     </td>
-	     <td align="center" style="height:20px"><tmpl_var task.duration> <tmpl_var task.duration.units></td>
-	     <td align="center" style="height:20px"><tmpl_var task.start></td>
-	     <td align="center" style="height:20px"><tmpl_var task.end></td>
-	     <td align="center" style="height:20px"><tmpl_var task.dependants></td>	
-	     <tmpl_var task.lagTime>
-	     <tmpl_var task.taskType><tmpl_var task.seqNum>
-      </tr>
-      </tmpl_loop>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-   </tbody>
-</table>
-<tmpl_var form.footer>
-
-<div id="links">
-<!-- 	<tmpl_if project.canEdit><a href="<tmpl_var task.resources.url>"><tmpl_var task.resources.label></a>&nbsp;|&nbsp;</tmpl_if> -->
-	<tmpl_if task.canAdd><a href="<tmpl_var task.add.url>" class="submodal-400-300"><tmpl_var task.add.label></a>&nbsp;|&nbsp;</tmpl_if>
-	<a href="<tmpl_var task.back.url>"><tmpl_var task.back.label></a>
-</div>
-
-~~~
-<style type="text/css">
-	body, html {
-		margin:0px;
-		padding:0px;
-	}
-	.project {
-		position:relative;
-		margin-top:5px;
-		margin-left:5px;
-	}
-	.project td {
-		border:solid silver 1px;
-		border-bottom:solid gray 1px;
-		font-size:9pt;
-		font-family:arial;		
-	}
-	.project a {
-	    color:#000000;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.project a:hover {
-	    color:#7AB7E9;
-		font-weight: normal;
-		font-size: 9pt;
-		text-decoration: none;
-	}
-	
-	.taskname {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 295px;
-    }
-	.taskduration {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 25px;
-	}
-	.taskdate {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 68px;
-	}
-	.taskdependant {
-	   font-family: verdana;
-	   font-size: 10px;
-	   font-weight: normal;
-	   color: black;
-	   width: 20px;
-	}
-	tr.monthNames td {		
-		text-align:center;		
-	}
-	tr.dates td {
-		width:16px;
-	}
-	div.scroller {		
-		overflow:scroll;		
-		position:relative;
-		width:400px;		
-	}
-	
-	* html div.scroller {
-		overflow-x:scroll;
-	}
-	
-	td.empty {
-		background-color:transparent;
-		border-style:none;
-		height:20px;
-	}
-	
-	div.barPositions {
-		position:relative;
-	}
-	div.projectBar {
-		position:absolute;
-		height:10px;
-		z-index:2;
-		padding:0px;
-		margin:0px;
-		font-size:1pt;
-	}
-	div.statusBar {	
-		background-color:#000;
-		position:absolute;	
-		height:5px;
-		z-index:3;
-		padding:0px;
-		top:2px;
-		margin:0px;		
-		font-size:1pt;		
-	}
-	
-	div.projectLineH {		
-		background: url('images/dot.gif') top repeat-x;		
-		font-size:1pt;
-		text-align:right;
-		position:absolute;
-	}		
-	div.projectLineV {
-		width:1px;
-		background-color:black;
-		position:relative;
-		font-size:1pt;	
-		height:100%;
-		float:right;
-	}
-	
-	div.projectLabel {
-		position:absolute;
-		margin-top:-3px;
-		white-space:nowrap;
-		font-family: verdana;
-		font-size:8px;
-	}
-	
-	div.milestone {
-		color:#000000;
-		position:absolute;
-		z-index:4;
-		margin:0px;
-		padding:0px;		
-		margin-top:-3px;
-		font-size: 10px;
-		font-family: times;
-	}
-	
-	#links {
-		margin-top:7px;
-		margin-left:5px;
-		font-family:arial;
-		font-size:9pt;
-	}
-	
-	#links a {
-		color:#7AB7E9;
-	}
-</style>
-
-<style>
-.popUp {
-			width:100%;
-			border:solid black 0px;
-			background-color:#F5F5F5;
-		}
-		.popUp td {
-			font-size:9pt;	
-			font-family:arial;
-			border-top:solid #E0E0E0 1px;
-		}	
-		.popUp tr.clear td {
-			border-style:none;
-			background-color:#F0F0F0;
-		}
-		.popUp tr.clearNoBG td {
-			border-style:none;
-		}
-		.popUp td.header {
-			font-weight:bold;
-		}
-		.popUp td span.header {
-			font-weight:bold;
-		}
-		a.saveBtn {
-			width:40px;
-			height:15px;
-			background-color:silver;
-			padding:1px;
-			padding-left:5px;
-			padding-right:5px;
-			color:white;
-			border:solid gray 1px;
-			text-decoration:none;
-			font-weight:bold;
-			display:block;
-			float:right;
-			text-align:center;
-		}
-		a.saveBtn:hover {
-			background-color:#F0F0F0;
-			color:gray;
-		}		
-</style>
diff --git a/docs/upgrades/templates-7.1.0/events-calendar-big.tmpl b/docs/upgrades/templates-7.1.0/events-calendar-big.tmpl
deleted file mode 100644
index 54046b27c..000000000
--- a/docs/upgrades/templates-7.1.0/events-calendar-big.tmpl
+++ /dev/null
@@ -1,144 +0,0 @@
-#PBtmpl0000000000000022
-
-<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>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<tmpl_if session.var.adminOn>
-	<a href="<tmpl_var addevent.url>"><tmpl_var addevent.label></a>
-	<p />
-</tmpl_if>
-
-<tmpl_loop month_loop>
-	<br />
-	<table width="100%" class="calendarBig">
-	<tr><td colspan="7" class="tableHeader"><tmpl_var month> <tmpl_var year></td></tr>
-	<tr>
-	<tmpl_if session.user.firstDayOfWeek>
-		<th class="tableData"><tmpl_var monday.label></th>
-		<th class="tableData"><tmpl_var tuesday.label></th>
-		<th class="tableData"><tmpl_var wednesday.label></th>
-		<th class="tableData"><tmpl_var thursday.label></th>
-		<th class="tableData"><tmpl_var friday.label></th>
-		<th class="tableData"><tmpl_var saturday.label></th>
-		<th class="tableData"><tmpl_var sunday.label></th>
-	<tmpl_else>
-		<th class="tableData"><tmpl_var sunday.label></th>
-		<th class="tableData"><tmpl_var monday.label></th>
-		<th class="tableData"><tmpl_var tuesday.label></th>
-		<th class="tableData"><tmpl_var wednesday.label></th>
-		<th class="tableData"><tmpl_var thursday.label></th>
-		<th class="tableData"><tmpl_var friday.label></th>
-		<th class="tableData"><tmpl_var saturday.label></th>
-	</tmpl_if>
-	</tr><tr>
-	<tmpl_loop prepad_loop>
-		<td>&nbsp;</td>
-	</tmpl_loop>
- 	<tmpl_loop day_loop>
-		<tmpl_if isStartOfWeek>
-			<tr>
-		</tmpl_if>
-		<td class="table<tmpl_if isToday>Today<tmpl_else>Data</tmpl_if>" valign="top" align="left"><p><b><tmpl_var day></b></p>
-		<tmpl_loop event_loop>
-			<tmpl_if name>
-				&middot;<a href="<tmpl_var url>"><tmpl_var name></a><br />
-			</tmpl_if>
-		</tmpl_loop>
-		</td>
-		<tmpl_if isEndOfWeek>
-			</tr>
-		</tmpl_if>
-	</tmpl_loop>
-	<tmpl_loop postpad_loop>
-		<td>&nbsp;</td>
-	</tmpl_loop>
-	</tr>
-	</table>
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage> <tmpl_var pagination.pageList.upTo20> <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
-
-~~~
-
-<style type="text/css">
-.pagination
-{
-	-moz-box-sizing:border-box;
-	background:#C0C0C0;
-	width:100%;
-	text-align:center;
-	padding:3px;
-	font-size:9pt;
-	font-family:arial;
-	margin-bottom:5px;
-}
-
-.pagination a
-{
-	color:white;
-}
-
-.fontSettings
-{
-	font-family:arial;
-	font-size:9pt;
-}
-
-h2
-{
-	font-family:arial;
-	margin-top:3px;
-	margin-bottom:3px;
-}
-
-.calendarBig
-{
-	/*border:solid gray 1px;*/
-}
-
-.calendarBig .tableHeader
-{
-	text-align:center;
-	font-size:13pt;
-	letter-spacing:2px;
-	background-color:#DADADA;
-}
-
-.calendarBig .tableData
-{
-	width:14%;
-}
-
-.calendarBig .tableToday
-{
-	font-size:9pt;
-	background-color:#DADADA;
-}	
-
-.calendarBig .tableToday a
-{
-	color:#29587E;
-}
-
-.calendarBig td
-{
-	border:solid silver 1px;
-}
-</style>
diff --git a/docs/upgrades/templates-7.1.3/defaultMatrixView.tmpl b/docs/upgrades/templates-7.1.3/defaultMatrixView.tmpl
deleted file mode 100644
index 0e6b31ffd..000000000
--- a/docs/upgrades/templates-7.1.3/defaultMatrixView.tmpl
+++ /dev/null
@@ -1,142 +0,0 @@
-#matrixtmpl000000000001
-<tmpl_if session.var.adminOn>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-<h2><tmpl_var title></h2>
-
-<tmpl_if description>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<table width="100%" class="matrixDefault">
-<tr><td valign="top" class="leftColumn">
-<p>Use the form below to select up to <tmpl_var maxComparisons> listings to compare at once.
-</p>
-
-<div>
-<tmpl_var compare.form>
-</div>
-
-</td><td valign="top">
-
-
-<p class="grayBox">
-<b>Narrow The Matrix</b><br />
-You can narrow the scope of the matrix by <a href="<tmpl_var search.url>">searching</a> for exactly the criteria you're looking for in a listing.
-</p>
-
-
-<p class="grayBox">
-<b>Expand The Matrix</b><br />
-<tmpl_if isLoggedIn>
-   <a href="<tmpl_var listing.add.url>">Click here to add a new listing.</a> Please note that you will be the official maintainer of the listing, and will be responsible for keeping it up to date.
-<tmpl_else>
-If you are the maker of a product, or are an expert user and are willing to maintain the listing, <a href="^a(linkonly);">create an account</a> so you can register your listing.
-</tmpl_if>
-
-</p>
-
-
-
-<br /><b>Listing Statistics</b><br />
-<table width="100%" border="0" class="stats">
-<tr>
-  <td class="columnOne">Most clicks:</td>
-  <td class="columnTwo"><tmpl_var best.clicks.count></td>
-  <td class="columnThree"><a href="<tmpl_var best.clicks.url>"><tmpl_var best.clicks.name></a></td>
-</tr>
-<tr>
-  <td>Most views:</td>
-  <td><tmpl_var best.views.count></td>
-  <td><a href="<tmpl_var best.views.url>"><tmpl_var best.views.name></a></td>
-</tr>
-<tr>
-  <td>Most compares:</td>
-  <td><tmpl_var best.compares.count></td>
-  <td><a href="<tmpl_var best.compares.url>"><tmpl_var best.compares.name></a></td>
-</tr>
-<tr>
-  <td>Most recently updated:</td>
-  <td><tmpl_var best.updated.date></td>
-  <td><a href="<tmpl_var best.updated.url>"><tmpl_var best.updated.name></a></td>
-</tr>
-<tr>
-  <td colspan="3" class="hrStyle">^Spacer(1,1);</td>
-</tr>
-<tr>
-  <td align="center" colspan="3">Best Rated By Users</td>
-</tr>
-<tmpl_loop best_rating_loop>
-<tr>
-  <td><tmpl_var category></td>
-  <td><tmpl_var mean>/10</td>
-  <td><a href="<tmpl_var url>"><tmpl_var name></a></td>
-</tr>
-</tmpl_loop>
-
-
-<tr>
-  <td colspan="3" class="hrStyle">^Spacer(1,1);</td>
-</tr>
-<tr>
-  <td colspan="3" align="center"><a href="<tmpl_var ratings.details.url>">View Ratings Details</a></td>
-</tr>
-<tr>
-  <td colspan="3" class="hrStyle">^Spacer(1,1);</td>
-</tr>
-
-
-<tr>
-  <td align="center" colspan="3">Worst Rated By Users</td>
-</tr>
-<tmpl_loop worst_rating_loop>
-<tr>
-  <td><tmpl_var category></td>
-  <td><tmpl_var mean>/10</td>
-  <td><a href="<tmpl_var url>"><tmpl_var name></a></td>
-</tr>
-</tmpl_loop>
-
-<tr>
-  <td colspan="3" class="hrStyle">^Spacer(1,1);</td>
-</tr>
-
-</table>
-
-<br />
-<br /><b>Site Statistics</b><br />
-<table class="content">
-<tr>
-  <td>Listing Count:</td>
-  <td><tmpl_var listing.count></td>
-</tr>
-<tr>
-  <td>Current Visitors:</td>
-  <td><tmpl_var current.user.count></td>
-</tr>
-<tr>
-  <td>Registered Users:</td>
-  <td><tmpl_var user.count></td>
-</tr>
-</table>
-
-
-
-
-<tmpl_if session.var.adminOn>
-<p>   <a href="<tmpl_var field.list.url>">List Fields</a> 
-</p>
-<tmpl_if pending_list>
-<b>PENDING LISTINGS:</b>
-</tmpl_if>
-<ul>
-<tmpl_loop pending_list>
-<li><a href="<tmpl_var url>"><tmpl_var productName></a></li>
-</tmpl_loop>
-</ul>
-</tmpl_if>
-
-</td></tr></table>
-
diff --git a/docs/upgrades/templates-7.2.0/commerce_checkout_confirmation.tmpl b/docs/upgrades/templates-7.2.0/commerce_checkout_confirmation.tmpl
deleted file mode 100644
index 8726d5763..000000000
--- a/docs/upgrades/templates-7.2.0/commerce_checkout_confirmation.tmpl
+++ /dev/null
@@ -1,78 +0,0 @@
-#PBtmpl0000000000000016
-<a href="<tmpl_var viewShoppingCart.url>"><tmpl_var viewShoppingCart.label></a> &middot;
-<a href="<tmpl_var changePayment.url>"><tmpl_var changePayment.label></a> &middot; 
-<a href="<tmpl_var changeShipping.url>"><tmpl_var changeShipping.label></a><br />
-<br />
-
-<tmpl_var title><br />
-<ul>
-<tmpl_loop errorLoop>
-<li><tmpl_var message></li>
-</tmpl_loop>
-</ul>
-
-<table> <tr align="left">
-      <th style="border-bottom: 2px solid black">Product</th>
-      <th style="border-bottom: 2px solid black">Quantity</th>
-      <th style="border-bottom: 2px solid black" align='center'>Price</th>
-      <th style="border-bottom: 2px solid black">Amount</th>
-      <th style="border-bottom: 2px solid black">Sales Tax</th>
-      <th style="border-bottom: 2px solid black">Each</th>
-  </tr>
-
-  <tmpl_if normalItems>
-  </tmpl_if>
-
-  <tmpl_loop normalItemsLoop>
-  <tr>
-      <td align="left"><tmpl_var name></td>
-      <td align="center"><tmpl_var quantity></td>
-      <td align="right"><tmpl_var price></td>
-      <td align="right"><tmpl_var totalPrice></td>
-      <td align="right"><tmpl_var salesTax></td>
-      <td>&nbsp;</td>
-  </tr>
-  </tmpl_loop>
-
-  <tmpl_loop recurringItemsLoop>
-  <tr>
-      <td align="left"><tmpl_var name></td>
-      <td align="center"><tmpl_var quantity></td>
-      <td align="left"><tmpl_var price></td>
-      <td align="right"><tmpl_var totalPrice></td>
-      <td align="right"><tmpl_var salesTax></td>
-      <td align="left"><tmpl_var period></td>
-  </tr>
-</tmpl_loop>
-  <tr style="border-top: 1px solid black">
-      <td colspan='2' style="border-top: 1px solid black">&nbsp;</td>
-      <td align="right" style="border-top: 1px solid black"><b>Subtotal</b></td>
-      <td align="right" style="border-top: 1px solid black"><b><tmpl_var subtotal></b></td>
-  </tr>
-  <tr>
-      <td colspan="3" align="right">Shipping</td>
-      <td align="right"><tmpl_var shippingCost></td>
-  </tr>
-  <tr>
-      <td colspan="3" align="right"><tmpl_var discountsApplied.label></td>
-      <td align="right"><tmpl_var discountsApplied></td>
-  </tr>
-  <tr>
-      <td colspan="2" align="right">Sales Tax Rate</td>
-      <td align="right"><tmpl_var salesTaxRate></td>
-      <td style="border-top: 1px solid black">&nbsp;</td>
-  </tr>
-  <tr>
-      <td colspan="3" align="right">Total Sales Tax</td>
-      <td style="border-top: 1px solid black">&nbsp;</td>
-      <td align="right"><tmpl_var totalSalesTax></td>
-  </tr>
-  <tr>
-      <td colspan="3" align="right" style="border-top: 1px solid black"><b>Total</b></td>
-      <td align="right" style="border-top: 1px solid black"><b><tmpl_var total></b></td>
-  </tr>
-</table>
-
-<br /><br />
-
-<tmpl_var form>
diff --git a/docs/upgrades/templates-7.2.0/default-pm-template-dashboard.tmpl b/docs/upgrades/templates-7.2.0/default-pm-template-dashboard.tmpl
deleted file mode 100644
index 0a6d58729..000000000
--- a/docs/upgrades/templates-7.2.0/default-pm-template-dashboard.tmpl
+++ /dev/null
@@ -1,69 +0,0 @@
-#ProjectManagerTMPL0001
-<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>
-	<div class="fontSettings">
-		<tmpl_var description>
-	</div>
-</tmpl_if>
-
-<script type="text/javascript">
-   function doDelete(url) {
-      if( confirm('<tmpl_var project.delete.warning>') ) {
-	     location.href=url;
-	  }
-   }
-</script>
-
-<table cellpadding="3" cellspacing="0" border="0" class="projectView">
-   <tr>
-	   <td colspan="6" style="border-style:none;text-align:left;" valign="bottom">
-		   <tmpl_if canEditProjects><a href="<tmpl_var project.create>"><tmpl_var project.create.label></a><tmpl_else>&#160;</tmpl_if>
-	   </td>
-    </tr>
-
-    <tr class="header">
-	   <td><tmpl_var project.name.label></td>
-	   <td><tmpl_var project.startDate.label></td>
-	   <td><tmpl_var project.endDate.label></td>
-	   <td><tmpl_var project.cost.label></td>
-	   <td><tmpl_var project.complete.label></td>
-	   <tmpl_if canEditProjects>
-	      <td><tmpl_var project.actions.label></td>
-	   </tmpl_if>
-    </tr>
-	<tmpl_if noProjects>
-	   <tr><td class="projectNames" colspan="<tmpl_var empty.colspan>"><tmpl_var noProjects></td></tr>
-	<tmpl_else>
-	   <tmpl_loop project.loop>
-	      <tr class="alt">
-	         <td class="projectNames">
-			    <a href="<tmpl_var project.view.url>"><tmpl_var project.name.data></a>
-			 </td>
-	         <td><tmpl_var project.startDate.data></td>
-	         <td><tmpl_var project.endDate.data></td>
-	         <td><tmpl_var project.cost.data.int></td>
-	         <td>
-		        <div class="completeContainer">
-			       <div class="completeBar" style="width:<tmpl_var project.complete.data.int>%;"></div>
-			       <div class="completeText"><tmpl_var project.complete.data.float>%</div>
-		        </div>
-	         </td>
-			 <tmpl_if canEditProjects>
-	            <td>
-			        <!-- <a href="#"><img src="<tmpl_var extras>/add.gif" style="border-style:none;" alt="" /></a>&nbsp; -->
-				   <a href="<tmpl_var project.edit.url>"><img src="<tmpl_var extras>/edit.gif" style="border-style:none;" title="<tmpl_var project.edit.title>" alt="edit" /></a>&nbsp;
-				   <a href="javascript:void(doDelete('<tmpl_var project.delete.url>'));"><img src="<tmpl_var extras>/delete.gif" style="border-style:none;" title="<tmpl_var project.delete.title>" alt="delete" /></a>
-			    </td>
-             </tmpl_if>
-		  </tr>
-	   </tmpl_loop>
-	</tmpl_if>
-</table>
-
diff --git a/docs/upgrades/templates-7.2.0/ems_checkout.tmpl b/docs/upgrades/templates-7.2.0/ems_checkout.tmpl
deleted file mode 100644
index 14570c13b..000000000
--- a/docs/upgrades/templates-7.2.0/ems_checkout.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-#EventManagerTmpl000003
-<tmpl_if resolveConflicts>
-<tmpl_var form.header>
-<table width="100%" border="0">
-<tr><td><tmpl_var message></td></tr>
-
-<tr>
-	<td>
-		<table width="100%">
- <tmpl_loop conflict_loop>
-		<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>>
-			<td><tmpl_var form.deleteControl></td>
-			<td><tmpl_var title></td>
-			<td><tmpl_var description></td>
-			<td><tmpl_var price></td>
-		</tr>
- </tmpl_loop>
-		</table>
-	</td>
-</tr> 
-<tr><td><tmpl_var form.submit></td></tr>
-</table>
-<tmpl_var form.footer>
-</tmpl_if>
-
-
-
-
-<tmpl_if registration>
-  <tmpl_var form.header>
-  <tmpl_var form.message>
-  <tmpl_var form.chooserJS>
-  <table style="border-top:solid gray 1px;width:100%;margin-top:5px;">
-<tmpl_if form.badgeId><tr><td><tmpl_var form.badgeId.label></td><td><tmpl_var form.badgeId></td></tr></tmpl_if>
-  <tr><td><tmpl_var form.firstName.label></td><td><tmpl_var form.firstName></td></tr>
-<tr><td><tmpl_var form.lastName.label></td><td><tmpl_var form.lastName></td></tr>
-<tr><td><tmpl_var form.address.label></td><td><tmpl_var form.address></td></tr>
-<tr><td><tmpl_var form.city.label></td><td><tmpl_var form.city></td></tr>
-<tr><td><tmpl_var form.state.label></td><td><tmpl_var form.state></td></tr>
-<tr><td><tmpl_var form.zipcode.label></td><td><tmpl_var form.zipcode></td></tr>
-<tr><td><tmpl_var form.country.label></td><td><tmpl_var form.country></td></tr>
-<tr><td><tmpl_var form.phoneNumber.label></td><td><tmpl_var form.phoneNumber></td></tr>
-<tr><td><tmpl_var form.email.label></td><td><tmpl_var form.email></td></tr>
-<tr><td colspan="2"><br /><tmpl_var form.submit><a href="<tmpl_var cancelRegistration.url>" style="text-align: right;"><tmpl_var cancelRegistration.url.label></a></td></tr>
-</table>
-<script type="text/javascript">
-
-function swapBadgeInfo(badgeId) {
-	var selector = document.getElementById('badgeId_formId');
-	for (var i in badges[badgeId]) {
-		var field = document.getElementById(i+'_formId');
-		if (field && badges[badgeId][i]) {
-			field.value=badges[badgeId][i];
-		} else {
-			if (field) field.value='';
-		}
-	}
-}	
-
-var selector1 = document.getElementById('badgeId_formId');
-if (selector1) {
-	swapBadgeInfo(selector1.value);
-}
-
-</script>
-<tmpl_var form.footer>
-</tmpl_if>
-
-<tmpl_if prereqsAreMissing>
-<tmpl_var form.header>
-<table border="1">
-
-<tmpl_loop message_loop>
-<tr>
-	<td colspan="4"><strong><tmpl_var title> requires all of the following:</strong></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<ul>
-<tmpl_loop messageLoop>
-			<li><tmpl_var reqmessage></li>
-</tmpl_loop>
-		</ul>
-	</td>
-</tr>
-</tmpl_loop>
-
-<tmpl_loop missingEvents_loop>
-<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>><td><tmpl_var form.checkBox></td><td><tmpl_var title></td><td><tmpl_var description></td><td><tmpl_var price></td></tr>
-</tmpl_loop>
-<tr><td colspan="4"><br /><tmpl_var form.submit></td></tr>
-</table>
-<tmpl_var form.footer>
-
-</tmpl_if>
-
diff --git a/docs/upgrades/templates-7.2.2/viewPurchaseHistory.tmpl b/docs/upgrades/templates-7.2.2/viewPurchaseHistory.tmpl
deleted file mode 100755
index 4b4f989a7..000000000
--- a/docs/upgrades/templates-7.2.2/viewPurchaseHistory.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-#PBtmpl0000000000000019
-<table border="0">
-<tmpl_loop purchaseHistoryLoop>
-	<tr>
-		<td><b><tmpl_var initDate></b></td>
-		<td><b><tmpl_var completionDate></b></td>
-		<td align="right"><b>$ <tmpl_var amount></b></td>
-		<td><b><tmpl_var status></b></td>
-		<td><tmpl_if canCancel><a href="<tmpl_var cancelUrl>">Cancel</a></tmpl_if></td>
-	</tr>
-	<tmpl_loop itemLoop>
-	<tr>
-		<td align="right"><tmpl_var quantity> x </td>
-		<td align="left"><tmpl_var itemName></td>
-		<td align="right"><tmpl_var amount></td>
-	</tr>
-	</tmpl_loop>
-</tmpl_loop>
-</table>
diff --git a/docs/upgrades/templates-7.3.0/admin-console-style.tmpl b/docs/upgrades/templates-7.3.0/admin-console-style.tmpl
deleted file mode 100644
index 0875bbe1d..000000000
--- a/docs/upgrades/templates-7.3.0/admin-console-style.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
-#PBtmpl0000000000000137
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>WebGUI <tmpl_var session.webgui.version>-<tmpl_var session.webgui.status> Admin Console</title>
-	<link rel="icon" href="^Extras(favicon.png);" type="image/png" />
-	<link rel="shortcut icon" href="^Extras(favicon.ico);" />
-	<tmpl_var head.tags>
-</head>
-<body>
-<div class="wrapper">
-	<tmpl_var body.content>
-</div>
-</body>
-</html>
diff --git a/docs/upgrades/templates-7.3.0/default-calendar-day.tmpl b/docs/upgrades/templates-7.3.0/default-calendar-day.tmpl
deleted file mode 100644
index 670676a3c..000000000
--- a/docs/upgrades/templates-7.3.0/default-calendar-day.tmpl
+++ /dev/null
@@ -1,280 +0,0 @@
-#CalendarDay00000000001
-#create
-#namespace:Calendar/Day
-#url:default-calendar-day
-#title:Default Calendar Day
-#menuTitle:Default Calendar Day
-
-<tmpl_if admin>
-	<p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL">
-<tr>
-	<td style="text-align:right">
-		<a href="<tmpl_var urlDay>" class="tab active">Day</a>
-		<a href="<tmpl_var urlWeek>" class="tab">Week</a>
-		<a href="<tmpl_var urlMonth>" class="tab">Month</a>
-		<a href="/<tmpl_var url>?func=search" class="tab">Search</a>
-		
-		<div class="controls">
-			<tmpl_if editor><a href="/<tmpl_var url>?func=add;class=WebGUI::Asset::Event">Add Event</a></tmpl_if>
-			<!--&bull; <a href="#">Print</a> 
-			&bull; <a href="#">Subscribe</a>-->
-		</div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="padding:3px 0px;">
-			<a href="<tmpl_var pagePrevUrl>" style="font-weight:bold;margin-right:8px;">&laquo; Previous Day
-			</a>&bull;
-			
-			<span style="margin-right:8px;margin-left:8px;" class="monthLink current"><tmpl_var dayAbbr>, <tmpl_var monthAbbr> <tmpl_var dayOfMonth>. <tmpl_var year></span>&bull;
-			<a href="<tmpl_var pageNextUrl>" style="font-weight:bold;padding-left:8px">Next Day &raquo;</a>	 
-		</div>
-	</td>
-</tr>
-<tr>
-	<td>
-		<div  class="curMonth">
-			<tmpl_var dayName>, <tmpl_var monthName> <tmpl_var dayOfMonth>, <tmpl_var year>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tmpl_loop hours><tr>
-			<td class="heading">
-				<div style="padding:4px;"><tmpl_var hour12>:00<tmpl_var hourM></div>
-			</td>
-			<td class="day">							
-				<ul class="eventList">
-					<tmpl_loop events><li>
-					<a href="/<tmpl_var eventUrl>"><tmpl_var eventTitle></a>
-					</tmpl_loop></li>
-				</ul>				
-			</td>
-		</tr></tmpl_loop>
-		</table>		
-	</td>
-</tr>
-</table>
-~~~
-	<style type="text/css">
-		/* Edited with EditCSS */
-
-/**** Inline STYLE-tag style sheet ****/
-
-		body * {
-			margin:0px;
-		}	
-		#mCAL {
-			
-		}
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style:none;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#E9ECF3;
-			-moz-border-radius-topLeft:10px;
-			-moz-border-radius-topRight:10px;
-			color:#7588B5;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL .controls {
-			float:right;
-			vertical-align:bottom;
-		}
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .heading {
-			width:200px;
-			-moz-box-sizing:border-box;
-			background-color:#ABB7D1;
-			text-align:center;
-			font-weight:bold;
-			color:#374664;
-			font-size:9px;
-			letter-spacing:1px;
-			text-transform:uppercase;
-			text-align:right;
-			vertical-align:top;
-			-moz-border-radius-bottomRight:8px;
-			-moz-border-radius-topRight:8px;			
-		}
-		#mCAL .day {
-			background-color:#E9ECF3;			
-			width:400px;
-			position:relative;
-			vertical-align:top;		
-			-moz-border-radius-topLeft:8px;
-			-moz-border-radius-bottomLeft:8px;			
-			border:solid #CCD2E3 1px;
-		}
-		#mCAL .curDay {
-			background-color:#FFE4B3;
-			border-color:orange;
-		}
-		#mCAL .dayWrapper {			
-			height:100%;
-			width:100%;
-			position:relative;
-			z-index:0;
-			margin:0px;	
-			padding:0px 0px 2px 5px;;
-			-moz-box-sizing:border-box;
-		}
-		html > body #mCAL .dayWrapper {
-			height:auto;
-			min-height:100%;
-		}
-		#mCAL .dayNum {
-			width:100%;
-			text-align:right;
-			
-		}
-
-		#mCAL span.border {							
-			text-align:center;			
-			padding:5px;
-			font-weight:bold;
-			-moz-border-radius-bottomRight:5px;
-			-moz-border-radius-topLeft:5px;
-			color:black;			
-			border-right:solid #CCD2E3 1px;
-			border-bottom: solid #CCD2E3 1px;
-			background-color:#ABB7D1;
-			-moz-box-sizing:border-box;
-			top:5px;
-			position:relative;
-			
-		}
-		#mCAL .curDay span.border {
-			background-color:orange;
-			color:black;
-			border-color:orange;
-		}
-		#mCAL .event {
-			padding:3px;
-			padding-top:8px;
-			clear:left;
-			font-weight:bold;			
-		}
-		#mCAL .event a {
-			color:#4F4F4F;
-			text-decoration:none;
-			font-size:9px;
-		}
-		#mCAL .moreButton {
-			border-style:none;
-			z-index:5;
-			position:absolute;
-			bottom:0px;
-			width:100%;
-			height:9px;
-			background-color:#517AC8;	
-			font-size:5px;
-			text-align:center;
-		}
-		#mCAL .moreButton:hover {
-			background-color:orange;
-		}
-		#mCAL .empty {
-			border-style:none;
-			background-color:#CCD2E3;
-			-moz-border-radius:10px;
-			
-		}
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;			
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-		#mCAL .months .current {
-			color:#517AC8;
-		}
-		#mCAL .current {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:center;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-		
-		/* MORE STYLES */
-		#more1 {
-			position:absolute;
-			top:170px;
-			left:10px;			
-			
-		}
-		* html #more1 {
-			top:158px;
-			left:12px;
-
-		}
-		.moreDisplay {
-			border:solid orange 1px;
-			border-top:solid orange 2px;
-			font-family:arial;
-			font-size:10px;
-			width:300px;
-			padding:2px;
-			background-color:#FFD3A8;
-			z-index:10;			
-		}
-		ul.eventList {
-			margin:0px;
-			padding:0px;
-			margin-left:30px;
-			color:#526896;
-		}
-	</style>
diff --git a/docs/upgrades/templates-7.3.0/default-calendar-event-edit.tmpl b/docs/upgrades/templates-7.3.0/default-calendar-event-edit.tmpl
deleted file mode 100644
index 15fdbf106..000000000
--- a/docs/upgrades/templates-7.3.0/default-calendar-event-edit.tmpl
+++ /dev/null
@@ -1,167 +0,0 @@
-#CalendarEventEdit00001
-#create
-#namespace:Calendar/EventEdit
-#url:default-calendar-event-edit
-#title:Default Calendar Event Edit
-#menuTitle:Default Calendar Event Edit
-
-<tmpl_var formHeader>
-
-<tmpl_if formErrors>
-<h1>Errors!</h1>
-<ul>
-<tmpl_loop formErrors>
-	<li><tmpl_var message></li>
-</tmpl_loop>
-</ul>
-</tmpl_if>
-
-<table id="tabs" cellpadding="0" cellspacing="0" border="0">
-<tr>
-	<td style="text-align:left;">
-		<a href="#" onclick="toggleTab('event'); return false;" class="tab active">Events</a>
-		<a href="#" onclick="toggleTab('recursion'); return false;" class="tab">Recurrence</a>
-		<tmpl_var formSave>
-		<tmpl_var formCancel>
-	</td>
-</tr>
-</table>
-
-<!-- Event tab -->
-<table id="event" cellpadding="0" cellspacing="0" border="0">
-<tr>
-	<td class="border" style="text-align:left;width:700px">
-		<table cellpadding="2" style="margin:5px;">
-		<tr>
-			<td class="label" style="text-align:right">Event Title</td>
-			<td><tmpl_var formTitle></td>
-		</tr>
-		<tr>
-			<td class="label" style="text-align:right">Short Title</td>
-			<td><tmpl_var formMenuTitle></td>
-		</tr>
-		<tr>
-			<td class="label" style="text-align:right">Location</td>
-			<td><tmpl_var formLocation></td>
-		</tr>	
-		<tr>
-			<td class="label" style="text-align:right;vertical-align:top">Description</td>
-			<td><tmpl_var formDescription></td>
-		</tr>
-		<tr>
-			<td class="label" style="text-align:right;vertical-align:top">Start Date</td>
-			<td><tmpl_var formStartDate></td>
-		</tr>	
-		<tr>
-			<td class="label" style="text-align:right;vertical-align:top">End Date</td>
-			<td><tmpl_var formEndDate></td>
-		</tr>
-		<tr>
-			<td class="label" style="text-align:right;vertical-align:top">Time</td>
-			<td><tmpl_var formTime></td>
-		</tr>
-		
-		<tr><td colspan="2">&nbsp;</td></tr>
-		<tr>
-			<td class="label" style="text-align:right;vertical-align:top;">Related Links</td>
-			<td><tmpl_var formRelatedLinks></td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-
-<table style="display: none; margin: 5px;" id="recursion" cellpadding="2" cellspacing="0" border="0">
-<tr>
-	<td class="label" style="text-align:right;vertical-align:top">Recurrence Pattern</td>
-	<td><tmpl_var formRecurPattern></td>
-</tr>
-<tr>
-	<td class="label" style="text-align:right;vertical-align:top">Recurrence Range</td>
-	<td>
-		<p style="float: left; margin: 5px;">Start:</p> 
-		<div style="float: left; margin: 5px;"><tmpl_var formRecurStart></div>
-		<p style="float: left; clear: left; margin: 5px;">End:</p>
-		<div style="float: left; margin: 5px;"><tmpl_var formRecurEnd></div>
-	</td>
-</tr>
-<!--<tr>
-	<td class="label" style="text-align:right;vertical-align:top">Include Dates</td>
-	<td><tmpl_var formRecurInclude></td>
-</tr>
-<tr>
-	<td class="label" style="text-align:right;vertical-align:top">Exclude Dates</td>
-	<td><tmpl_var formRecurExclude></td>
-</tr>-->
-</table>
-
-<tmpl_var formFooter>
-
-
-<script type="text/javascript">
-var old_tab = document.getElementById("event");
-function toggleTab(id) 
-{
-	if (old_tab)
-		old_tab.style.display = "none";
-	element = document.getElementById(id);
-	element.style.display = "block";
-	old_tab = element;
-}
-</script>
-~~~
-<script src="/extras/yui/build/yahoo/yahoo.js" type="text/javascript"></script>
-<script src="/extras/yui/build/event/event.js" type="text/javascript"></script>
-<script src="/extras/yui/build/dom/dom.js" type="text/javascript"></script>
-<script src="/extras/yui/build/dragdrop/dragdrop.js" type="text/javascript"></script>
-<script src="/extras/yui/build/logger/logger.js" type="text/javascript"></script>
-<script src="/extras/yui-ext/yui-ext-core.js" type="text/javascript"></script>
-<script src="/extras/yui-ext/resizable-lib.js" type="text/javascript"></script>
-<link href="/extras/yui-ext/resources/css/resizable.css" rel="stylesheet" type="text/css" />
-<script src="/extras/textFix.js" type="text/javascript"></script>
-
-<script src="/extras/tinymce2/jscripts/tiny_mce/tiny_mce.js" type="text/javascript"></script>
-<script src="/extras/tinymce2/jscripts/webgui.js" type="text/javascript"></script>
-<script src="/extras/tabs/tabs.js" type="text/javascript"></script>
-<style type="text/css">
-	body * {
-		margin:0px;
-	}
-	table td {
-		font-family:Arial;			
-		font-size:10px;
-	}
-	#tabs a {
-		border:solid #F0F0F0 1px;
-		-moz-border-radius-topLeft: 20px;
-		-moz-border-radius-topRight: 20px;
-		font-weight:bold;
-		padding: 2px 15px 0px 15px;
-		text-align;center;
-		background-color:#FBFBFB;
-		border-top:solid #F0F0F0 2px;
-		color:#b0b0b0;
-		text-decoration:none;
-		font-size:10pt;
-		display:block;
-		float:left;
-		margin-right:5px;
-	}
-	#tabs a:hover {
-		color:black;
-	}
-	#tabs .active {
-		background-color:#F0F0F0;
-		color:#404040;
-	}
-	table a {
-		font-size:11px;
-		color:#447BFD;
-	}
-	input {
-		font-size:10px;
-		border:gray solid 1px;
-		background-color:#F0F0F0;
-		cursor:pointer;
-	}
-</style>
diff --git a/docs/upgrades/templates-7.3.0/default-calendar-event.tmpl b/docs/upgrades/templates-7.3.0/default-calendar-event.tmpl
deleted file mode 100644
index 19e07a590..000000000
--- a/docs/upgrades/templates-7.3.0/default-calendar-event.tmpl
+++ /dev/null
@@ -1,220 +0,0 @@
-#CalendarEvent000000001
-#create
-#namespace:Calendar/Event
-#url:default-calendar-event
-#title:Default Calendar Event
-#menuTitle:Default Calendar Event
-
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL" border="0">
-<tr>
-	<td style="text-align:right;border-bottom:solid white 1px;">
-		<a href="<tmpl_var urlDay>" class="tab">Day</a>
-		<a href="<tmpl_var urlWeek>" class="tab">Week</a>
-		<a href="<tmpl_var urlMonth>" class="tab">Month</a>
-		<a href="<tmpl_var urlParent>?func=search" class="tab">Search</a>
-		
-		<div class="controls">
-			<a href="/<tmpl_var url>?func=edit">Edit</a> &bull; <a href="?func=delete">Delete</a>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="float: left;"><a href="<tmpl_var prevUrl>">&lt;&lt; Previous Event</a></div>
-		<div style="float: right;"><a href="<tmpl_var nextUrl>">Next Event &gt;&gt;</a></div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		Event Details
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Event Title</div>
-			</td>
-			<td class="day">	
-				<div class="eventWrapper">
-					<tmpl_var title>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Location</div>
-			</td>
-			<td class="day">	
-				<div class="eventWrapper">
-					<tmpl_var location>
-				</div>
-			</td>
-		</tr>
-		
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Description</div>
-			</td>
-			<td class="day">							
-				<div class="eventWrapper"><tmpl_var description></div>
-			</td>
-		</tr>
-
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Scheduled</div>
-			</td>
-			<td class="day">							
-				<div class="eventWrapper">
-					<tmpl_var startDateDayName>,
-					<tmpl_var startDateMonthName>
-					<tmpl_var startDateDayOfMonth>
-					<tmpl_var startDateHour>:<tmpl_var startDateMinute> <tmpl_var startDateM> &bull; <tmpl_var endDateDayName>, 
-					<tmpl_var endDateMonthName>
-					<tmpl_var endDateDayOfMonth>
-					<tmpl_var endDateHour>:<tmpl_var endDateMinute> <tmpl_var endDateM>
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Related Material</div>
-			</td>
-			<td class="day">								<div class="eventWrapper"><tmpl_loop relatedLinks>
-				<a href="<tmpl_var link.url>"><tmpl_var linkUrl></a><br />
-				</tmpl_loop></div>
-			</td>
-		</tr>
-	
-		</table>
-	</td>
-</tr>
-</table>
-
-~~~
-
-<style type="text/css">
-		/* Edited with EditCSS */
-
-/**** Inline STYLE-tag style sheet ****/
-
-		body * {
-			margin:0px;
-		}	
-		#mCAL {
-			
-		}
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style:none;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#E9ECF3;
-			-moz-border-radius-topLeft:10px;
-			-moz-border-radius-topRight:10px;
-			color:#7588B5;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .heading {
-			width:200px;
-			-moz-box-sizing:border-box;
-			background-color:#ABB7D1;
-			text-align:center;
-			font-weight:bold;
-			color:#374664;
-			font-size:9px;
-			letter-spacing:1px;
-			text-transform:uppercase;
-			text-align:right;
-			vertical-align:top;
-			-moz-border-radius-bottomRight:8px;
-			-moz-border-radius-topRight:8px;			
-		}
-		#mCAL .day {
-			background-color:#E9ECF3;			
-			width:400px;
-			position:relative;
-			vertical-align:top;		
-			-moz-border-radius-topLeft:8px;
-			-moz-border-radius-bottomLeft:8px;			
-			border:solid #CCD2E3 1px;
-		}
-
-		
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;	
-			color:#3E4D75;
-			font-size:14px;
-			font-weight:bold;
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-		#mCAL .months .current {
-			color:#517AC8;
-		}
-		#mCAL .current {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:center;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-
-		#mCAL .searchField {
-			margin: 2px 10px;
-			border:solid #ABB7D1 1px;
-		}
-		#mCAL .searchBtn {
-			background-color: #ABB7D1;
-			border:solid #CCD2E3 1px;
-			color:white;
-			font-weight:bold;
-			cursor:pointer;
-		}
-		
-		#mCAL .eventWrapper {
-			margin:2px 10px;
-		}
-	</style>
diff --git a/docs/upgrades/templates-7.3.0/default-calendar-month.tmpl b/docs/upgrades/templates-7.3.0/default-calendar-month.tmpl
deleted file mode 100644
index 825a58f20..000000000
--- a/docs/upgrades/templates-7.3.0/default-calendar-month.tmpl
+++ /dev/null
@@ -1,388 +0,0 @@
-#CalendarMonth000000001
-#create
-#namespace:Calendar/Month
-#url:default-calendar-month
-#title:Default Calendar Month
-#menuTitle:Default Calendar Month
-<tmpl_if admin>
-	<p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<div id="calendar">
-	<!-- tabs -->
-	<div class="tabs">
-		<a href="<tmpl_var urlDay>">Day</a>
-		<a href="<tmpl_var urlWeek>">Week</a>
-		<a href="<tmpl_var urlMonth>">Month</a>
-		<a href="/<tmpl_var url>?func=search">Search</a>
-	</div>
-	
-	<!-- other actions -->
-	<div class="actions">
-		<tmpl_if editor><a href="/<tmpl_var url>?func=add;class=WebGUI::Asset::Event">Add Event</a></tmpl_if>
-		<!--&bull; <a href="#">Print</a>
-		&bull; <a href="#">Subscribe</a>-->
-	</div>
-	
-	
-	<div class="navigation">
-		<!-- previous year -->
-		<div class="previous"><a href="<tmpl_var pagePrevUrl>">&laquo; <tmpl_var pagePrevYear></a></div>
-	
-		<!-- next year -->
-		<div class="next"><a href="<tmpl_var pageNextUrl>"><tmpl_var pageNextYear>&raquo;</a></div>
-	
-	
-		<!-- months in this year -->
-		<ul class="months">
-		<tmpl_loop months>
-		<li>
-			<a href="<tmpl_var monthUrl>" class="<tmpl_if monthCurrent>current</tmpl_if>"><tmpl_var monthAbbr></a>
-		</li>
-		</tmpl_loop>
-		</ul>
-	</div>
-	
-	
-	<!-- banner -->
-	<h2><tmpl_var monthName> <tmpl_var year></h2>
-	
-	
-	<!-- the calendar table -->
-	<table id="month">
-		<!-- day names -->
-		<tr><tmpl_loop dayNames>
-			<th><tmpl_var dayName></th>
-		</tmpl_loop></tr>
-		
-		<!-- the grid -->
-		<tmpl_loop weeks><tr>
-		<tmpl_loop days><td><div class="<tmpl_if dayMonth>active</tmpl_if><tmpl_if dayCurrent> current</tmpl_if>">
-			<tmpl_if dayMonth>
-			<a class="number" href="<tmpl_var dayUrl>"><tmpl_var dayMonth></a>
-
-			<tmpl_if events>
-			<ul class="events"><tmpl_loop events>
-				<li><a href="/<tmpl_var eventUrl>">
-					<tmpl_var eventMenuTitle>
-				</a></li>
-			</tmpl_loop></ul>			
-			<a href="#" onmouseover="DelayedRollover.showPopup('more<tmpl_var dayMonth>')" onmouseout="DelayedRollover.hidePopup('more<tmpl_var dayMonth>')" class="moreButton" onclick="return false;">
-				<img src="/extras/wobject/Calendar/images/more.gif" />
-			</a>
-			<div style="display: none" id="more<tmpl_var dayMonth>" class="moreDisplay" onmouseover="DelayedRollover.showPopup('more<tmpl_var dayMonth>')" onmouseout="DelayedRollover.hidePopup('more<tmpl_var dayMonth>')" >
-			<tmpl_loop events>
-			<a href="/<tmpl_var eventUrl>"><tmpl_var eventTitle></a><br/>
-			</tmpl_loop>
-			</div>
-			</tmpl_if> <!--/events-->
-			</tmpl_if> <!--/day-->
-		</div></td></tmpl_loop> <!--/days-->
-		</tr></tmpl_loop>
-	</table>
-</div>
-
-~~~
-<script type="text/javascript">
-// Delayed rollovers
-// From: http://www.pjhyett.com/articles/2006/07/05/timeout-your-mouseovers
-// Modified by: Doug Bell
-var DelayedRollover = {
-    timeout : new Array(),
-    showPopup : function(e){
-	element = document.getElementById(e);
-        clearTimeout(this.timeout[e]);
-        if(element.style.display == 'none'){
-            this.timeout[e] = setTimeout(function(){element.style.display="block"},10);
-        }
-    },
-    hidePopup : function(e){
-	element = document.getElementById(e);
-         if(element.style.display == 'none'){
-            clearTimeout(this.timeout[e]);
-        }else{
-            this.timeout[e] = setTimeout(function(){element.style.display="none"},10);
-        }
-    }    
-}
-</script>
-<style type="text/css">
-body * 
-{
-	margin:			0px;
-}
-
-#calendar *	
-{
-	/* Override any defaults that mess up our template */
-}
-
-#calendar
-{
-	width:			630px;
-}
-
-
-
-/**** DEFAULTS ****/
-#calendar td 
-{
-	font-size:		10px;
-	font-family:		Arial, sans-serif;
-}
-
-#calendar a 
-{
-	font-size:		11px;
-	color:			#517AC8;
-}
-
-#calendar h2 
-{
-	text-align:		center;
-	margin: 		2px 0px;
-	background-color:	#517AC8;
-	color:			white;
-	font-size:		14px;
-	font-weight:		bold;
-}
-
-
-/**** Tabs ****/
-#calendar .tabs
-{
-	list-style:		none;
-	float:			left;
-	text-align:		left;
-	margin:			0px;
-	padding:		0px;
-}
-
-#calendar .tabs a
-{	
-	-moz-border-radius-topLeft:	10px;
-	-moz-border-radius-topRight:	10px;
-	display:		block;
-	float:			left;
-	margin-right:		5px;
-	padding: 		2px 15px 0px 15px;
-	border-bottom-style:	none;
-	background-color:	#E9ECF3;
-	color:			#7588B5;
-	font-weight:		bold;
-	font-size:		10pt;
-	text-align:		center;
-	text-decoration:	none;
-}
-
-#calendar .tabs a:hover 
-{
-	color:			black;
-}
-
-
-/**** Actions ****/
-#calendar .actions
-{
-	float:			right;
-	vertical-align:		bottom;
-}
-
-
-/**** Navigation ****/
-#calendar .navigation 
-{
-	clear:			both;
-	text-align:		center;
-	background-color:	#DFE3EE;
-	padding:		3px 0px;		
-}
-
-#calendar .navigation .previous
-{
-	float:			left;
-}
-
-#calendar .navigation .next
-{
-	float:			right;
-}
-
-#calendar .navigation ul 
-{
-	list-style:		none;
-	margin:			0px;
-	padding:		0px;
-}
-
-#calendar .navigation li
-{
-	display:		inline;
-	margin:			0px;
-	padding:		0px;
-}
-
-#calendar .navigation a 
-{
-	text-decoration:	none;			
-	padding-left:		5px;
-	padding-right:		5px;
-	color:			#AAB8D5;
-	font-size:		12px;
-	font-weight:		bold;
-}	
-
-#calendar .navigation a.current, #calendar .navigation a:hover 
-{
-	-moz-border-radius:	5px;
-	font-weight:		bold;
-	color:			#517AC8;
-	background-color:	#fff;			
-}
-
-/**** Month view ****/
-/* Table */
-#calendar table#month
-{
-	z-index:		1;
-}
-
-#calendar table#month *
-{
-	padding:		0px;
-	margin:			0px;
-}
-
-#calendar table#month a
-{
-	text-decoration:	none;
-}
-
-#calendar table#month th
-{
-	-moz-box-sizing:border-box;
-	width:			85px;
-	background-color:	#517AC8;
-	text-align:		center;
-	font-weight:		bold;
-	color:			white;	
-}
-
-#calendar table#month div
-{
-	position:		relative;
-	width:			85px;
-	height:			85px;
-	margin:			0px;
-	background-color:	#E9ECF3;
-}
-
-#calendar table#month ul 
-{	
-	overflow:		hidden;
-}
-
-#calendar table#month .active 
-{
-	-moz-border-radius-topLeft:	8px;
-	-moz-border-radius-bottomLeft:	8px;
-	-moz-border-radius-bottomRight:	8px;
-	vertical-align:		top;		
-	background-color:	#CCD2E3;
-	border:			solid #CCD2E3 1px;
-}
-
-#calendar table#month .current 
-{
-	background-color:	#FFE4B3;
-	border-color:		orange;
-}
-
-#calendar table#month .number 
-{
-	-moz-border-radius-bottomLeft:5px;
-	display:		block;
-	position:		absolute;
-	top:			0px;
-	right:			0px;
-	height:			10px;
-	width:			10px;
-	background-color:	#516BA4;
-	color:			white;
-	text-align:		center;
-	vertical-align:		middle;
-	padding:		0px 3px 2px 2px;
-	font-weight:		bold;
-}
-
-#calendar table#month .current .number
-{
-	background-color:	orange;
-	color:			black;
-}
-
-#calendar table#month .events 
-{
-	padding:		3px;
-	padding-top:		8px;
-	font-weight:		bold;			
-}
-
-#calendar table#month .events a 
-{
-	color:			#4F4F4F;
-	text-decoration:	none;
-	font-size:		9px;
-}
-
-#calendar table#month .moreButton 
-{
-	border-style:		none;
-	position:		absolute;
-	bottom:			0px;
-	width:			100%;
-	height:			9px;
-	background-color:	#517AC8;	
-	font-size:		5px;
-	text-align:		center;
-	-moz-border-radius-bottomLeft:	8px;
-	-moz-border-radius-bottomRight:	8px;
-}
-
-#calendar table#month .moreButton img
-{
-	border:			none;
-}
-
-#calendar table#month .moreButton:hover
-{
-	background-color:	orange;
-}
-
-
-/* MORE STYLES */
-
-#calendar table#month .moreDisplay {
-position: absolute;
-left: 0px;
-top: 85px;
-border:solid orange 1px;
-border-top:solid orange 2px;
-font-family:arial;
-font-size:10px;
-width:300px;
-height: auto;
-padding:2px;
-background-color:#FFD3A8;
-z-index: 100;
-}
-* html body table#month td { position: relative; z-index: 1; }
-</style>
diff --git a/docs/upgrades/templates-7.3.0/default-calendar-search.tmpl b/docs/upgrades/templates-7.3.0/default-calendar-search.tmpl
deleted file mode 100644
index 895dbb1af..000000000
--- a/docs/upgrades/templates-7.3.0/default-calendar-search.tmpl
+++ /dev/null
@@ -1,316 +0,0 @@
-#CalendarSearch00000001
-#create
-#namespace:Calendar/Search
-#url:default-calendar-search
-#title:Default Calendar Search
-#menuTitle:Default Calendar Search
-
-<tmpl_var form.header>
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL" border="0">
-<tr>
-	<td style="text-align:right">
-		<a href="/<tmpl_var url>?type=day" class="tab">Day</a>
-		<a href="/<tmpl_var url>?type=week" class="tab">Week</a>
-		<a href="/<tmpl_var url>?type=month" class="tab">Month</a>
-		<a href="/<tmpl_var url>?func=search" class="tab active">Search</a>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		&nbsp;
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Keyword</div>
-			</td>
-			<td class="day">
-				<tmpl_var form.keywords>
-			</td>
-		</tr>
-		
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Start Date</div>
-			</td>
-			<td class="day">
-				<tmpl_var form.startDate>	
-			</td>
-		</tr>
-
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">End Date</div>
-			</td>
-			<td class="day">
-				<tmpl_var form.endDate>
-			</td>
-		</tr>
-
-		</table>
-	</td>
-</tr>
-<tr>
-	<td style="text-align:right">
-	<tmpl_var form.submit>
-	</td>
-</tr>
-</table>
-<tmpl_var form.footer>
-
-
-
-<tmpl_if results>
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL">
-<tr>
-	<td>
-		<div  class="curMonth">
-			Search Results
-			<span style="font-size:9px;">Displaying page <tmpl_var pagination.pageCount> of <tmpl_var pagination.pageCount></span>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="padding:3px 0px;">			
-			<tmpl_var pagination.firstPage>
-			<tmpl_var pagination.pageList>
-			<tmpl_var pagination.lastPage>	 
-		</div>
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tmpl_loop results><tr>
-			<td class="heading">
-				<div style="padding:4px;"><tmpl_var startDate></div>
-			</td>
-			<td class="day">
-				<a href="/<tmpl_var url>" style="padding-left:10px"><tmpl_var title></a>
-			</td>
-		</tr></tmpl_loop>
-		</table>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="padding:3px 0px;">
-			<tmpl_var pagination.firstPage>
-			<tmpl_var pagination.pageList>
-			<tmpl_var pagination.lastPage>	 
-		</div>
-	</td>
-</tr>
-</table>
-</tmpl_if>
-
-
-~~~
-	<style type="text/css">
-		body * {
-			margin:0px;
-		}	
-		#mCAL {
-			
-		}
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style:none;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#E9ECF3;
-			-moz-border-radius-topLeft:10px;
-			-moz-border-radius-topRight:10px;
-			color:#7588B5;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL .controls {
-			float:right;
-			vertical-align:bottom;
-		}
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .heading {
-			width:200px;
-			-moz-box-sizing:border-box;
-			background-color:#ABB7D1;
-			text-align:center;
-			font-weight:bold;
-			color:#374664;
-			font-size:9px;
-			letter-spacing:1px;
-			text-transform:uppercase;
-			text-align:right;
-			vertical-align:top;
-			-moz-border-radius-bottomRight:8px;
-			-moz-border-radius-topRight:8px;			
-		}
-		#mCAL .day {
-			background-color:#E9ECF3;			
-			width:400px;
-			position:relative;
-			vertical-align:top;		
-			-moz-border-radius-topLeft:8px;
-			-moz-border-radius-bottomLeft:8px;			
-			border:solid #CCD2E3 1px;
-		}
-		#mCAL .curDay {
-			background-color:#FFE4B3;
-			border-color:orange;
-		}
-		#mCAL .dayWrapper {			
-			height:100%;
-			width:100%;
-			position:relative;
-			z-index:0;
-			margin:0px;	
-			padding:0px 0px 2px 5px;;
-			-moz-box-sizing:border-box;
-		}
-		html > body #mCAL .dayWrapper {
-			height:auto;
-			min-height:100%;
-		}
-		#mCAL .dayNum {
-			width:100%;
-			text-align:right;
-			
-		}
-
-		#mCAL span.border {							
-			text-align:center;			
-			padding:5px;
-			font-weight:bold;
-			-moz-border-radius-bottomRight:5px;
-			-moz-border-radius-topLeft:5px;
-			color:black;			
-			border-right:solid #CCD2E3 1px;
-			border-bottom: solid #CCD2E3 1px;
-			background-color:#ABB7D1;
-			-moz-box-sizing:border-box;
-			top:5px;
-			position:relative;
-			
-		}
-		#mCAL .curDay span.border {
-			background-color:orange;
-			color:black;
-			border-color:orange;
-		}
-		#mCAL .event {
-			padding:3px;
-			padding-top:8px;
-			clear:left;
-			font-weight:bold;			
-		}
-		#mCAL .event a {
-			color:#4F4F4F;
-			text-decoration:none;
-			font-size:9px;
-		}
-		#mCAL .moreButton {
-			border-style:none;
-			z-index:5;
-			position:absolute;
-			bottom:0px;
-			width:100%;
-			height:9px;
-			background-color:#517AC8;	
-			font-size:5px;
-			text-align:center;
-		}
-		#mCAL .moreButton:hover {
-			background-color:orange;
-		}
-		#mCAL .empty {
-			border-style:none;
-			background-color:#CCD2E3;
-			-moz-border-radius:10px;
-			
-		}
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;			
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-		#mCAL .months .current {
-			color:#517AC8;
-		}
-		#mCAL .current {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:left;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-		
-		/* MORE STYLES */
-		#more1 {
-			position:absolute;
-			top:170px;
-			left:10px;			
-			
-		}
-		* html #more1 {
-			top:158px;
-			left:12px;
-
-		}
-		.moreDisplay {
-			border:solid orange 1px;
-			border-top:solid orange 2px;
-			font-family:arial;
-			font-size:10px;
-			width:300px;
-			padding:2px;
-			background-color:#FFD3A8;
-			z-index:10;			
-		}
-		ul.eventList {
-			margin:0px;
-			padding:0px;
-			margin-left:30px;
-			color:#526896;
-		}
-	</style>
diff --git a/docs/upgrades/templates-7.3.0/default-calendar-week.tmpl b/docs/upgrades/templates-7.3.0/default-calendar-week.tmpl
deleted file mode 100644
index b0ef427c5..000000000
--- a/docs/upgrades/templates-7.3.0/default-calendar-week.tmpl
+++ /dev/null
@@ -1,263 +0,0 @@
-#CalendarWeek0000000001
-#create
-#namespace:Calendar/Week
-#url:default-calendar-week
-#title:Default Calendar Week
-#menuTitle:Default Calendar Week
-
-<tmpl_if admin>
-	<p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<div id="calendar">
-	<!-- tabs -->
-	<div class="tabs">
-		<a href="<tmpl_var urlDay>">Day</a>
-		<a href="<tmpl_var urlWeek>">Week</a>
-		<a href="<tmpl_var urlMonth>">Month</a>
-		<a href="/<tmpl_var url>?func=search">Search</a>
-	</div>
-	
-	<!-- other actions -->
-	<div class="actions">
-		<tmpl_if editor><a href="/<tmpl_var url>?func=add;class=WebGUI::Asset::Event">Add Event</a></tmpl_if>
-		<!--&bull; <a href="#">Print</a>
-		&bull; <a href="#">Subscribe</a>-->
-	</div>
-	
-	
-	<div class="navigation">
-		<!-- previous year -->
-		<div class="previous"><a href="<tmpl_var pagePrevUrl>">&laquo; Previous Week</a></div>
-	
-		<!-- next year -->
-		<div class="next"><a href="<tmpl_var pageNextUrl>">Next Week &raquo;</a></div>
-	
-		<!-- I guess write the week again -->
-		<p><tmpl_var startMonthAbbr> <tmpl_var startDayOfMonth>, <tmpl_var startYear> to <tmpl_var endMonthAbbr> <tmpl_var endDayOfMonth>, <tmpl_var endYear></p>
-	</div>
-	
-	
-	<!-- banner -->
-	<h2><tmpl_var startMonthName> <tmpl_var startDayOfMonth>, <tmpl_var startYear> to <tmpl_var endMonthName> <tmpl_var endDayOfMonth>, <tmpl_var endYear></h2>
-	
-	
-	<!-- the calendar table -->
-	<table id="week">
-		<tmpl_loop days><tr>
-		<th><tmpl_var dayName></th>
-		<td><div>
-		<div class="number"><tmpl_var dayOfMonth></div>
-		<tmpl_if events><ul><tmpl_loop events>
-			<li><a href="/<tmpl_var eventUrl>"><tmpl_var eventTitle></a></li>
-		</tmpl_loop></ul></tmpl_if></div></td> <!-- /events -->
-		</tr></tmpl_loop><!--/days-->
-	</table>
-</div>
-~~~
-<style type="text/css">
-body * 
-{
-	margin:			0px;
-}
-
-#calendar *	
-{
-	/* Override any defaults that mess up our template */
-}
-
-#calendar
-{
-	width:			630px;
-}
-
-
-
-/**** DEFAULTS ****/
-#calendar table
-{
-	width:			100%;
-}
-
-#calendar td 
-{
-	font-size:		10px;
-	font-family:		Arial, sans-serif;
-}
-
-#calendar a 
-{
-	font-size:		11px;
-	color:			#517AC8;
-}
-
-#calendar h2 
-{
-	text-align:		center;
-	margin: 		2px 0px;
-	background-color:	#517AC8;
-	color:			white;
-	font-size:		14px;
-	font-weight:		bold;
-}
-
-
-/**** Tabs ****/
-#calendar .tabs
-{
-	list-style:		none;
-	float:			left;
-	text-align:		left;
-	margin:			0px;
-	padding:		0px;
-}
-
-#calendar .tabs a
-{	
-	-moz-border-radius-topLeft:	10px;
-	-moz-border-radius-topRight:	10px;
-	display:		block;
-	float:			left;
-	margin-right:		5px;
-	padding: 		2px 15px 0px 15px;
-	border-bottom-style:	none;
-	background-color:	#E9ECF3;
-	color:			#7588B5;
-	font-weight:		bold;
-	font-size:		10pt;
-	text-align:		center;
-	text-decoration:	none;
-}
-
-#calendar .tabs a:hover 
-{
-	color:			black;
-}
-
-
-/**** Actions ****/
-#calendar .actions
-{
-	float:			right;
-	vertical-align:		bottom;
-}
-
-
-/**** Navigation ****/
-#calendar .navigation 
-{
-	clear:			both;
-	text-align:		center;
-	background-color:	#DFE3EE;
-	padding:		3px 0px;		
-}
-
-#calendar .navigation .previous
-{
-	float:			left;
-}
-
-#calendar .navigation .next
-{
-	float:			right;
-}
-
-#calendar .navigation ul 
-{
-	list-style:		none;
-	margin:			0px;
-	padding:		0px;
-}
-
-#calendar .navigation li
-{
-	display:		inline;
-	margin:			0px;
-	padding:		0px;
-}
-
-#calendar .navigation a 
-{
-	text-decoration:	none;			
-	padding-left:		5px;
-	padding-right:		5px;
-	color:			#AAB8D5;
-	font-size:		12px;
-	font-weight:		bold;
-}	
-
-#calendar .navigation a.current, #calendar .navigation a:hover 
-{
-	-moz-border-radius:	5px;
-	font-weight:		bold;
-	color:			#517AC8;
-	background-color:	#fff;			
-}
-
-/* Week */
-#calendar table#week th
-{
-	width:			35%;
-	-moz-box-sizing:	border-box;
-	background-color:	#ABB7D1;
-	text-align:		center;
-	font-weight:		bold;
-	color:			#374664;
-	font-size:		9px;
-	letter-spacing:		1px;
-	text-transform:		uppercase;
-	text-align:		right;
-	vertical-align:		top;
-	-moz-border-radius-bottomRight:8px;
-	-moz-border-radius-topRight:8px;		
-}
-
-#calendar table#week td 
-{
-	width:			65%;
-	vertical-align:		top;		
-	background-color:	#E9ECF3;			
-	-moz-border-radius-topLeft:8px;
-	-moz-border-radius-bottomLeft:8px;			
-	border:			solid #CCD2E3 1px;
-}
-
-#calendar table#week td div
-{
-	position:		relative;
-	min-height:		35px;
-}
-/* IE min-height hack */
-* html body #calendar table#week td { height: 45px; }
-
-#calendar table#week ul { padding-left: 50px; }
-
-#calendar table#week .number
-{
-	position:		absolute;
-	top:			-2px;
-	left:			-2px;
-	width:			2em;
-	height:			1em;
-	min-height:		1em;
-	text-align:		center;			
-	padding:		5px;
-	font-weight:		bold;
-	-moz-border-radius-bottomRight:5px;
-	-moz-border-radius-topLeft:5px;
-	color:			black;			
-	border-right:		solid #CCD2E3 1px;
-	border-bottom: 		solid #CCD2E3 1px;
-	background-color:	#ABB7D1;
-}
-
-
-</style>
diff --git a/docs/upgrades/templates-7.3.0/default-ems-template-event.tmpl b/docs/upgrades/templates-7.3.0/default-ems-template-event.tmpl
deleted file mode 100644
index cf4caad77..000000000
--- a/docs/upgrades/templates-7.3.0/default-ems-template-event.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#EventManagerTmpl000002
-<div class="badge" style="width:100%"> 
	<table cellpadding="3" cellspacing="0" style="width:100%">
	<tr>
		<td class="description" valign="top">
			<h2 class="title"><tmpl_var title></h2>
			<tmpl_var description>
		</td>
		<td rowspan="2" style="width:115px;align:center;" valign="top">
			<h2 class="price"><tmpl_var price></h2>
			
			<a href="<tmpl_var title.url>" class="grayButton">Search Eligible Events</a><br />
			<tmpl_if canManageEvents>
				<a title="Begin a Badge Purchase" style="cursor:pointer;" href="<tmpl_var purchase.url>" class="grayButton">ADMIN Purchase</a>
			<tmpl_else>
				<tmpl_unless eventIsFull>
					<a title="Begin a Badge Purchase" style="cursor:pointer;" href="<tmpl_var purchase.url>" class="grayButton">Purchase</a>
				<tmpl_else>
					&nbsp;<br />
				</tmpl_unless>
			</tmpl_if>  			
		</td>
	</tr>
	</table>
</div>
-
-~~~
-
-<style type="text/css">

tr.oddRow td {
	background-color:#DADADA;
	border-right:solid gray 1px;
}
tr.evenRow td {
	background-color:#E8E8E8;
	border-right:solid gray 1px;
}
.manageEvents {
	margin-top:5px;
	margin-bottom:5px;
}
.datacardtitle {
	background: #3D5690;
	color: white;
	font-family: verdana;
	font-weight: bold;
	font-size:13px;
}

.leftnav{
	padding: 1px 1px 1px 1px;
	background: white;
	color: black;
	font-family: verdana;
	font-weight: bold;
	font-size:11px;
	border: 2px #3D5690 ridge;
}
.leftnavon{
	padding: 1px 1px 1px 1px;
	background: yellow;
	color: black;
	font-family: verdana;
	font-weight: bold;
	font-size:11px;
	border: 2px #3D5690 ridge;
}
.calendartitle {
	background: #3D5690;
	color: white;
	font-family: verdana;
	font-weight: bold;
	font-size:11px;
}
.filter-select {
	font-family: verdana;
	font-size: 10px;
	font-weight: normal;
	color: black;
	width: 105px;
}
.compare-select {
	font-family: verdana;
	font-size: 10px;
	font-weight: normal;
	color: black;
	width: 76px;
}
.filter-text {
	font-family: verdana;
	font-size: 10px;
	font-weight: normal;
	color: black;
	width: 114px;
}
.smLink {
   font-family: verdana;
   font-size: 10px;
   font-weight: normal;
   color: blue;
}

.StepLabel { font-family: Tahoma; font-size: 14pt; letter-spacing: 2pt; color: #234E9C; 
               font-weight: bold }

/* BADGE CSS */
		.badge {
			width:92%;
			background-color:#F0F0F0;
			-moz-border-radius:15px;
			padding:5px;	
			-moz-box-sizing:border-box;
			font-family:verdana;
			font-size:9pt;
		}
		.badge h2.title {
			font-size:12.5pt;
			background-color:#E2E2E2;
			text-align:center;
			-moz-border-radius-topLeft:15px;			
			margin:0px;
			border:solid #E0E0E0 1px;
			padding:5px;
			-moz-box-sizing:border-box;
			box-sizing:border-box;
			color:gray;	
			margin-bottom:4px;
		}
		.badge h2.price {
			font-size:12.5pt;			
			text-align:center;
			-moz-border-radius-topRight:15px;			
			margin:0px;
			border:solid #E2E2E2 1px;
			padding:5px;
			-moz-box-sizing:border-box;
			box-sizing:border-box;
			color:gray;	
			margin-bottom:4px;
		}
		.badgeContent {
			background-color:#F4F4F4;			
			margin:0px;
			margin-top:5px;
			margin-bottom:5px;
			border:solid #E0E0E0 1px;
			padding:5px;
			-moz-box-sizing:border-box;
			box-sizing:border-box;
			font-family:verdana;
			font-size:9pt;
		}
		.badgeContent a.grayButton, .badge a.grayButton {
			width:100px;
			background-color:#E2E2E2;
			padding:5px;			
			color:gray;
			border:solid silver 1px;
			text-decoration:none;
			font-weight:bold;						
			text-align:center;
			-moz-border-radius:10px;
			display:block;
			font-size:7pt;
			margin-left:10px;
		}
		.badgeContent a.grayButton:hover, .badge a.grayButton:hover {
			background-color:#F0F0F0;
			border-color:#E2E2E2;
		}			
		.badgeFooter {
			width:100%;
			background-color:#E2E2E2;			
			-moz-border-radius-bottomLeft:15px;
			-moz-border-radius-bottomRight:15px;
			margin:0px;			
			border:solid #E0E0E0 1px;
			padding:5px;
			-moz-box-sizing:border-box;	
			box-sizing:border-box;			
			text-align:center;
		}
		.badgeFooter a {				
			
			background-color:#E2E2E2;
			padding:5px;			
			color:gray;
			border:solid #F4F4F4 1px;
			text-decoration:none;
			font-weight:bold;						
			text-align:center;
			-moz-border-radius:10px;
			display:block;
		}
		.badgeFooter a:hover {
			background-color:#F0F0F0;
			color:gray;
		}		
		.userData td {
			background-color:#E2E2E2;
			font-size:7pt;
			-moz-border-radius:15px;
			border:solid #F4F4F4 1px;
			font-weight:bold;
			
		}
		.userData td.data {
			background-color:#F4F4F4;
			border:solid #E2E2E2 1px;
			font-weight:normal;
		}	
		/* END OF BADGE CSS */
		
		
		
		/* EVENT LIST CSS */
		.eventList, .eventSearch {
			border:solid #F0F0F0 1px;
			padding:2px;
			-moz-border-radius-topLeft:15px;
			-moz-border-radius-topRight:15px;	
			font-family:verdana;
			font-size:9pt;
		}
		.eventList h2, .eventSearch h2 {
			margin:0px;
			font-family:verdana;
			text-align:center;
			font-size:12pt;
			background-color: #F0F0F0;
			color:black;
			-moz-border-radius-topLeft:15px;
			-moz-border-radius-topRight:15px;
			-moz-box-sizing:border-box;
			box-sizing:border-box;						
		}
		.eventList {	
			width:98%;
			border:solid #E0E0E0 1px;			
			font-size:9pt;
			font-family:verdana;
			/*background-color:#F4F4F4;*/
			margin-top:2px;
			-moz-box-sizing:border-box;
			box-sizing:border-box;
		}
		.event {			
			font-size:9pt;
			font-family:verdana;
			background-color:#F4F4F4;
			margin-top:2px;
			-moz-box-sizing:border-box;
			box-sizing:border-box;		
		}
		.event td {
			border-top:solid #E0E0E0 1px;
			border-bottom:solid #E0E0E0 1px;
			text-align:center;
		}
		.event th {
			font-size:8pt;
			text-align:center;
			background:white;
		}
		.event td.left {
			border-left:solid #E0E0E0 1px;
		}
		.event td.right {
			border-right:solid #E0E0E0 1px;
		}	
		.event td.empty {
			background-color:white;
			border-style:none;
			font-size:1px;
		}
		.event a {
			background-color:#E2E2E2;
			padding:5px;			
			color:gray;
			border:solid #F4F4F4 1px;
			text-decoration:none;
			font-weight:bold;						
			text-align:center;
			-moz-border-radius:10px;
			display:block;		
			width:80%;
		}
		.event a:hover {
			border: solid #E2E2E2 1px;
			background-color:#F0F0F0;
			color:gray;
		}		
		/* END EVENT LIST CSS */
		
		
		/* INSTRUCTIONS */
		.instructions {
			width:95%;
			border:solid #F0F0F0 1px;
			padding:5px;
			-moz-border-radius-topLeft:15px;
			-moz-border-radius-topRight:15px;	
			font-family:verdana;
			font-size:9pt;
		}
		/* END INSTRUCTIONS */

		
		/* SEARCH */
		.eventSearch form {
			margin:0px;
		}
		.eventSearch .searchBtn {
			background-color:#E2E2E2;			
			color:gray;
			padding-top:1px;
			padding-bottom:1px;
			border:solid #F4F4F4 1px;
			text-decoration:none;
			font-weight:bold;						
			text-align:center;
			-moz-border-radius:10px;		
		}
		.searchBtn:hover {
			border: solid #E2E2E2 1px;
			background-color:#F0F0F0;
			color:gray;		
		}
		.advSearch input, .advSearch select{
			font-size:8pt;
		}
		.advSearch .button {
			background-color:#CF1D1D;
			padding-left:2px;			
			padding-right:2px;			
			color:white;
			border:solid #9C1616 1px;
			text-decoration:none;
			font-weight:bold;						
			text-align:center;
			-moz-border-radius:10px;
			display:block;
			width:30px;
			font-size:10pt;			
			margin-left:10px;	
			height:100%;
		}
		.advSearch .button:hover {
			background-color:#9C1616;
			color:#CF1D1D;
			color:white;		
		}
		.advSearch .compare-select {
			width:75px;
		}		
		.advSearch .filter-text {
			width:98%;
		}
		* html .advSearch .filter-text {
			width:97%;
		}
		.advSearch tr.border td {
			font-size:1pt;
			background-color:#CFCFCF;
		}
		/* END SEARCH */
/* cart CSS */
		.cart {
			width:92%;
			background-color:#F0F0F0;
			-moz-border-radius:15px;
			padding:5px;	
			-moz-box-sizing:border-box;
			font-family:verdana;
			font-size:9pt;
		}
		.cart h2 {
			width:100%;
			font-size:12.5pt;
			background-color:#E2E2E2;
			text-align:center;
			-moz-border-radius-topLeft:15px;
			-moz-border-radius-topRight:15px;
			margin:0px;
			border:solid #E0E0E0 1px;
			padding:5px;
			-moz-box-sizing:border-box;
			box-sizing:border-box;
			color:gray;			
		}
		.cartContent {
			width:100%;
			background-color:#F4F4F4;			
			margin:0px;
			margin-top:5px;
			margin-bottom:5px;
			border:solid #E0E0E0 1px;
			padding:5px;
			-moz-box-sizing:border-box;
			box-sizing:border-box;
			font-family:verdana;
			font-size:9pt;
		}
		.cartContent a {
			background-color:#CF1D1D;
			padding:5px;			
			color:white;
			border:solid #9C1616 1px;
			text-decoration:none;
			font-weight:bold;						
			text-align:center;
			-moz-border-radius:10px;
			display:block;
			width:40px;
			font-size:7pt;
			float:right;
			margin-left:10px;
		}
		.cartContent a:hover {
			background-color:#9C1616;
			color:#CF1D1D;
			color:white;		
		}		
		.cartFooter {
			width:100%;
			background-color:#E2E2E2;			
			-moz-border-radius-bottomLeft:15px;
			-moz-border-radius-bottomRight:15px;
			margin:0px;			
			border:solid #E0E0E0 1px;
			padding:5px;
			-moz-box-sizing:border-box;	
			box-sizing:border-box;			
			text-align:center;
		}
		.cartFooter a {				
			
			background-color:#E2E2E2;
			padding:5px;			
			color:gray;
			border:solid #F4F4F4 1px;
			text-decoration:none;
			font-weight:bold;						
			text-align:center;
			-moz-border-radius:10px;
			display:block;
		}
		.cartFooter a:hover {
			background-color:#F0F0F0;
			color:gray;
		}		
		/* END OF cart CSS */

</style>

<link href="^Extras;/calendar/calendar-win2k-1.css" rel="stylesheet" type="text/css" />
\ No newline at end of file
diff --git a/docs/upgrades/templates-7.3.0/default-ems-template.tmpl b/docs/upgrades/templates-7.3.0/default-ems-template.tmpl
deleted file mode 100644
index 009d0e3e3..000000000
--- a/docs/upgrades/templates-7.3.0/default-ems-template.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#EventManagerTmpl000001
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if session.var.adminOn>
        <p><tmpl_var controls></p><br /><br />
</tmpl_if>

<table cellpadding="3" cellspacing="0" style="width:98%" class="EMS_view">
<tr>
	<td valign="top">

		<tmpl_if canManageEvents>
		<br />
		<table cellpadding="5" cellspacing="0" style="width:100%">
		<tr style="height:30px;">
			<td valign="top" style="width:190px;"><a href="<tmpl_var manageEvents.url>" class="grayButton">Manage Events</a></td>
			<td>(Event Directors and Staff)</td>
		</tr>
		<tr style="height:30px">
			<td valign="top" style="width:190px;"><a href="<tmpl_var manageRegistrants.url>" class="grayButton">Manage Registrants</a></td>
			<td>(Event Directors and Staff)</td>
		</tr>
		</tmpl_if>
		
		<tr style="height:30px">
			<td valign="top" style="width:190px;"><a href="<tmpl_var managePurchases.url>" class="grayButton">Modify Existing Badge</a></td>
			<td>Add Events to a Badge you've already purchased</td>
		</tr>
		</table>
	</td>
	<td style="width:250px" valign="top" align="center">

		<tmpl_if cart.purchaseLoop>
		<div class="cart">
			<h2>Shopping Cart</h2>
			
			<tmpl_loop cart.purchaseLoop>
			<div class="cartContent">
				<table border="0" cellpadding="0" cellspacing="0" width="100%">
				<tbody>
				<tr>
					<td>
						<b><tmpl_var purchase.mainEventTitle></b><br />
						<tmpl_loop registrantInfoLoop>
							Name: <tmpl_var firstName> <tmpl_var lastName>
						</tmpl_loop>
						<br />
						Additional Price: $<tmpl_var newPrice> 					
					</td>
				</tr>
				<tr>
					<td style="border-top:solid silver 1px;">
						<a href="<tmpl_var edit.url>" class="button"><img src="^Extras;/toolbar/bullet/edit.gif" style="border-style:none" alt="edit" /></a>
						<a href="<tmpl_var delete.url>" class="button"><img src="^Extras;/toolbar/bullet/delete.gif" style="border-style:none" alt="delete" /></a>
					</td>
				</tr>
				</tbody>
				</table>				
			</div>
			</tmpl_loop>
			
			<a href="<tmpl_var emptyCart.url>">Empty Cart</a><br /><a href="<tmpl_var checkout.url>">Checkout</a>
		</div>
		</tmpl_if>
	</td>
</tr>
</table>
<br />

<div>
	<span class="StepLabel">Step 1: </span> Choose a badge from the list below, or click the link above to add events to a badge you've already purchased.
</div>
<br />

<table width="100%" border="0" cellpadding="8" cellspacing="0">
<tmpl_loop events_loop>
<tr>
	<td valign="top" colspan="7"><tmpl_var event></td>
</tr>
</tmpl_loop>
</table>
<tmpl_var paginateBar>
-
-~~~
-
-<style type="text/css">
.EMS_view {
	background-color:#F4F4F4;
	border:solid #E2E2E2 1px;
	-moz-border-radius:15px;
}
.EMS_view a.grayButton {
	width:200px;
	background-color:#E2E2E2;
	padding:5px;			
	color:gray;
	border:solid silver 1px;
	text-decoration:none;
	font-weight:bold;						
	text-align:center;
	-moz-border-radius:10px;
	display:block;
	font-size:7pt;
	margin-left:10px;
	-moz-box-sizing:border-box;
}
.EMS_view a.grayButton:hover {
	background-color:#F0F0F0;
	border-color:#E2E2E2;
}
tr.oddRow td {
	background-color:#DADADA;
	border-right:solid gray 1px;
}
tr.evenRow td {
	background-color:#E8E8E8;
	border-right:solid gray 1px;
}
.manageEvents {
	margin-top:5px;
	margin-bottom:5px;
}
.datacardtitle {
	background: #3D5690;
	color: white;
	font-family: verdana;
	font-weight: bold;
	font-size:13px;
}

.leftnav{
	padding: 1px 1px 1px 1px;
	background: white;
	color: black;
	font-family: verdana;
	font-weight: bold;
	font-size:11px;
	border: 2px #3D5690 ridge;
}
.leftnavon{
	padding: 1px 1px 1px 1px;
	background: yellow;
	color: black;
	font-family: verdana;
	font-weight: bold;
	font-size:11px;
	border: 2px #3D5690 ridge;
}
.calendartitle {
	background: #3D5690;
	color: white;
	font-family: verdana;
	font-weight: bold;
	font-size:11px;
}
.filter-select {
	font-family: verdana;
	font-size: 10px;
	font-weight: normal;
	color: black;
	width: 105px;
}
.compare-select {
	font-family: verdana;
	font-size: 10px;
	font-weight: normal;
	color: black;
	width: 76px;
}
.filter-text {
	font-family: verdana;
	font-size: 10px;
	font-weight: normal;
	color: black;
	width: 114px;
}
.smLink {
   font-family: verdana;
   font-size: 10px;
   font-weight: normal;
   color: blue;
}

.StepLabel { font-family: Tahoma; font-size: 14pt; letter-spacing: 2pt; color: #234E9C; 
               font-weight: bold }
		.cart {			
			background-color:#F0F0F0;
			-moz-border-radius:15px;
			padding:5px;	
			-moz-box-sizing:border-box;
			box-sizing:border-box;
			font-family:verdana;
			font-size:9pt;
			border:solid #E2E2E2 1px;
			margin-right:10px;
			text-align:left;
		}
		.cart h2 {
			width:100%;
			font-size:12.5pt;
			background-color:#E2E2E2;
			text-align:center;
			-moz-border-radius-topLeft:15px;
			-moz-border-radius-topRight:15px;
			margin:0px;
			border:solid #E0E0E0 1px;
			padding:5px;
			-moz-box-sizing:border-box;
			box-sizing:border-box;
			color:gray;			
		}
		.cartContent {			
			background-color:#F4F4F4;			
			margin:0px;
			margin-top:5px;
			margin-bottom:5px;
			border:solid #E0E0E0 1px;
			padding:5px;
			-moz-box-sizing:border-box;
			box-sizing:border-box;
			font-family:verdana;
			font-size:9pt;
		}
		.cartContent a.button {
			background-color:#CF1D1D;
			padding:5px;			
			color:white;
			border:solid #9C1616 1px;
			text-decoration:none;
			font-weight:bold;						
			text-align:center;
			-moz-border-radius:10px;
			font-size:7pt;			
			margin-left:10px;
			margin-top:2px;
			width:auto;	
			display:block;
			float:right;
		}
		.cartContent a.button:hover {
			background-color:#9C1616;
			color:#CF1D1D;
			color:white;		
		}		
		.cartFooter {
			width:100%;
			background-color:#E2E2E2;			
			-moz-border-radius-bottomLeft:15px;
			-moz-border-radius-bottomRight:15px;
			margin:0px;			
			border:solid #E0E0E0 1px;
			padding:5px;
			-moz-box-sizing:border-box;	
			box-sizing:border-box;			
			text-align:center;
		}
		.cartFooter a {				
			
			background-color:#E2E2E2;
			padding:5px;			
			color:gray;
			border:solid #F4F4F4 1px;
			text-decoration:none;
			font-weight:bold;						
			text-align:center;
			-moz-border-radius:10px;
			display:block;
		}
		.cartFooter a:hover {
			background-color:#F0F0F0;
			color:gray;
		}		
</style>
diff --git a/docs/upgrades/templates-7.3.0/default-password-recovery-template.tmpl b/docs/upgrades/templates-7.3.0/default-password-recovery-template.tmpl
deleted file mode 100644
index 8270df0bb..000000000
--- a/docs/upgrades/templates-7.3.0/default-password-recovery-template.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#PBtmpl0000000000000014
-#namespace:Auth/WebGUI/Recovery2
-<h2><tmpl_var title></h2>
-
-<tmpl_if recoverMessage><tmpl_var recoverMessage></tmpl_if>
-
-<tmpl_var recoverFormHeader>
-<tmpl_var recoverFormHidden>
-<table>
-<tmpl_if doingRecovery>
-<tr>
-	<td class="formDescription" valign="top"><tmpl_var recoverFormPasswordLabel></td>
-	<td class="tableData"><tmpl_var recoverFormPassword></td>
-</tr>
-<tr>
-	<td class="formDescription" valign="top"><tmpl_var recoverFormPasswordConfirmLabel></td>
-	<td class="tableData"><tmpl_var recoverFormPasswordConfirm></td>
-</tr>
-<tmpl_else>
-<tmpl_if recoverFormUsername>
-<tr>
-	<td class="formDescription" valign="top"><tmpl_var recoverFormUsernameLabel></td>
-	<td class="tableData"><tmpl_var recoverFormUsername></td>
-</tr>
-</tmpl_if>
-<tmpl_loop recoverFormProfile>
-<tr>
-	<td class="formDescription" valign="top"><tmpl_var label></td>
-	<td class="tableData"><tmpl_var formElement></td>
-</tr>
-</tmpl_loop>
-</tmpl_if>
-<tr>
-	<td class="formDescription" valign="top"></td>
-	<td class="tableData"><tmpl_var recoverFormSubmit></td>
-</tr>
-</table>
-<tmpl_var recoverFormFooter>
-
-<div class="accountOptions">
-	<ul>
-		<tmpl_if anonymousRegistrationIsAllowed>
-			<li><a href="<tmpl_var createAccountUrl>"><tmpl_var createAccountLabel></a></li>
-		</tmpl_if>
-		<li><a href="<tmpl_var loginUrl>"><tmpl_var loginLabel></a></li>
-      	</ul>
-</div>
diff --git a/docs/upgrades/templates-7.3.0/default-wiki-front-page.tmpl b/docs/upgrades/templates-7.3.0/default-wiki-front-page.tmpl
deleted file mode 100644
index a5a23b730..000000000
--- a/docs/upgrades/templates-7.3.0/default-wiki-front-page.tmpl
+++ /dev/null
@@ -1,29 +0,0 @@
-#WikiFrontTmpl000000001
-#create
-#namespace:WikiMaster_front
-#url:default-wiki-front-page
-#title:Default Wiki Front Page
-#menuTitle:Default Wiki Front Page
-
-<tmpl_if session.var.adminOn><p><tmpl_var controls></p></tmpl_if>
-<tmpl_if displayTitle><h2><tmpl_var title></h2></tmpl_if>
-
-<tmpl_var description>
-<h3><tmpl_var searchLabel></h3>
-<tmpl_var searchFormHeader><tmpl_var searchQuery><tmpl_var searchSubmit><tmpl_var searchFormFooter>
-<br />
-
-<div style="float: left; width: 50%;">
-	<h3><a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a></h3>
-	<ul><tmpl_loop recentChanges>
-		<li><a href="<tmpl_var url>"><tmpl_var title></a></li>
-	</tmpl_loop></ul>
-</div>
-<div style="float: left;">
-	<h3><a href="<tmpl_var mostPopularUrl>"><tmpl_var mostPopularLabel></a></h3>
-	<ol><tmpl_loop mostPopular>
-		<li><a href="<tmpl_var url>"><tmpl_var title></a></li>
-	</tmpl_loop></ol>
-
-</div>
-<div style="clear: both;"></div>
diff --git a/docs/upgrades/templates-7.3.0/default-wiki-most-popular.tmpl b/docs/upgrades/templates-7.3.0/default-wiki-most-popular.tmpl
deleted file mode 100644
index 189eba66f..000000000
--- a/docs/upgrades/templates-7.3.0/default-wiki-most-popular.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-#WikiMPTmpl000000000001
-#create
-#namespace:WikiMaster_mostPopular
-#url:default-wiki-most-popular
-#title:Default Most Popular
-#menuTitle:Default Most Popular
-<h2><tmpl_var title></h2>
-
-<ol><tmpl_loop mostPopular>
-<li><a href="<tmpl_var url>"><tmpl_var title></a></li>
-</tmpl_loop></ol>
-
-<div style="padding: 8px;"><a href="<tmpl_var searchUrl>"><tmpl_var searchLabel></a> | <a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>
-
diff --git a/docs/upgrades/templates-7.3.0/default-wiki-page-edit.tmpl b/docs/upgrades/templates-7.3.0/default-wiki-page-edit.tmpl
deleted file mode 100644
index 73d73ee34..000000000
--- a/docs/upgrades/templates-7.3.0/default-wiki-page-edit.tmpl
+++ /dev/null
@@ -1,29 +0,0 @@
-#WikiPageEditTmpl000001
-#create
-#namespace:WikiPage_edit
-#url:default-wiki-page-edit
-#title:Default Wiki Page Edit
-#menuTitle:Default Wiki Page Edit
-<tmpl_var formHeader>
-<table>
-<tbody>
-<tr><td><label for="title_formId"><tmpl_var titleLabel></label></td><td><tmpl_var formTitle></td></tr>
-<tr><td><label for="content_formId"><tmpl_var contentLabel></label></td><td><tmpl_var formContent></td></tr>
-<tmpl_if canAdminister>
-	<tr><td><label for="isProtected_formId"><tmpl_var protectQuestionLabel></label></td><td><tmpl_var formProtect></td></tr>
-</tmpl_if>
-<tmpl_if allowsAttachments>
-	<tr><td><label for="storageId_formId"><tmpl_var attachmentLabel></label></td><td><tmpl_var formAttachment></td></tr>
-</tmpl_if>
-</tbody>
-</table>
-<tmpl_var formSubmit>
-<tmpl_var formFooter>
-
-<tmpl_if canAdminister><tmpl_unless isNew>
-	<ul>
-		<li><a href="<tmpl_var deleteUrl>"><tmpl_var deleteLabel></a></li>
-	</ul>
-</tmpl_unless></tmpl_if>
-
-
diff --git a/docs/upgrades/templates-7.3.0/default-wiki-page-history.tmpl b/docs/upgrades/templates-7.3.0/default-wiki-page-history.tmpl
deleted file mode 100644
index 88b8a1f53..000000000
--- a/docs/upgrades/templates-7.3.0/default-wiki-page-history.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-#WikiPHTmpl000000000001
-#create
-#namespace:WikiPage_pageHistory
-#url:default-wiki-page-history
-#title:Default Page History
-#menuTitle:Default Page History
-
-<ul>
-<tmpl_loop pageHistoryEntries>
-	<li><tmpl_var toolbar> <tmpl_var actionTaken> at <tmpl_var date> (<tmpl_var interval>) by <tmpl_var username></li>
-</tmpl_loop>
-</ul>
diff --git a/docs/upgrades/templates-7.3.0/default-wiki-page.tmpl b/docs/upgrades/templates-7.3.0/default-wiki-page.tmpl
deleted file mode 100644
index b4e9015b1..000000000
--- a/docs/upgrades/templates-7.3.0/default-wiki-page.tmpl
+++ /dev/null
@@ -1,118 +0,0 @@
-#WikiPageTmpl0000000001
-#create
-#namespace:WikiPage
-#url:default-wiki-page
-#title:Default Wiki Page
-#menuTitle:Default Wiki Page
-<tmpl_if session.var.adminOn><p><tmpl_var controls></p></tmpl_if>
-<h2><tmpl_var title></h2>
-
-    <div id="wikipage" class="yui-navset">
-        <ul class="yui-nav">
-            <li class="selected"><a href="#wikipagecontent"><em><tmpl_var viewLabel></em></a></li>
-            <li><a href="#wikipageedit"><em><tmpl_var editLabel></em></a></li>
-        </ul>
-        <div class="yui-content">
-            <div id="wikipagecontent">
-		<tmpl_var content>
-            </div>
-            <div id="wikipageedit">
-		<tmpl_var editContent>
-            </div>
-        </div>
-    </div>
-<script type="text/javascript">
-initWikiTabs = function() {
-    	var tabView = new YAHOO.widget.TabView('wikipage');
-		tabView.addTab(new YAHOO.widget.Tab({
-        	label: '<tmpl_var historyLabel>',
-        	dataSrc: '<tmpl_var historyUrl>',
-		cacheData: true
-    	}));
-};
-initWikiTabs();
-</script>
-<div style="padding: 8px;"><a href="<tmpl_var searchUrl>"><tmpl_var searchLabel></a> | <a href="<tmpl_var mostPopularUrl>"><tmpl_var mostPopularLabel></a> | <a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>
-
-~~~
-
-<link rel="stylesheet" type="text/css" href="^Extras(yui/build/tabview/assets/tabs.css);">
-<script type="text/javascript" src="^Extras(yui/build/yahoo/yahoo.js);"></script>
-<script type="text/javascript" src="^Extras(yui/build/event/event.js);"></script>
-<script type="text/javascript" src="^Extras(yui/build/dom/dom.js);"></script>
-<script type="text/javascript" src="^Extras(yui/build/connection/connection.js);"></script>
-<script type="text/javascript" src="^Extras(yui/build/tabview/tabview.js);"></script>
-
-<style type="text/css">
-#wikipage.yui-navset .yui-nav li a {
-    border:1px solid #000;  /* label and content borders */
-}
-
-#wikipage.yui-navset .yui-content {
-	border-top: 1px solid #000;
-	border-bottom: 1px solid #000;
-}
-
-#wikipage.yui-navset .yui-nav a:hover {
-    background-color:#f6f7ee; /* active tab, tab hover, and content bgcolor */
-}
-
-#wikipage.yui-navset .yui-nav .selected a {
-    background-color:black; /* active tab, tab hover, and content bgcolor */
-	color: white;
-}
-
-#wikipage.yui-navset-top .yui-nav .selected a {
-    border-bottom:0; /* no bottom border for active tab */
-    padding-bottom:1px; /* to match height of other tabs */
-}
-
-#wikipage.yui-navset-top .yui-content {
-    margin-top:-1px; /* for active tab overlap */
-}
-
-#wikipage.yui-navset-bottom .yui-nav .selected a {
-    border-top:0; /* no bottom border for active tab */
-    padding-top:1px; /* to match height of other tabs */
-}
-
-#wikipage.yui-navset-bottom .yui-content {
-    margin-bottom:-1px; /* for active tab overlap */
-}
-
-#wikipage.yui-navset-left .yui-nav li.selected a {
-    border-right:0; /* no bottom border for active tab */
-    padding-right:1px; /* to match height of other tabs */
-}
-
-#wikipage.yui-navset-left .yui-content {
-    margin-left:-1px; /* for active tab overlap */
-}
-
-#wikipage.yui-navset-right .yui-nav li.selected a {
-    border-left:0; /* no bottom border for active tab */
-    padding-left:1px; /* to match height of other tabs */
-}
-
-#wikipage.yui-navset-right .yui-content {
-    margin-right:-1px; /* for active tab overlap */
-    *margin-right:0; /* except IE */
-}
-
-#wikipage .yui-content {
-    padding-top:1em; 
-    padding-bottom:1em; 
-}
-#wikipage .loading {
-    background-image:url(^Extras(yui/build/tabview/img/loading.gif););
-    background-position:center center;
-    background-repeat:no-repeat;
-}
-
-#wikipage .loading * {
-    display:none;
-}
-</style>
-
-
-
diff --git a/docs/upgrades/templates-7.3.0/default-wiki-recent-changes.tmpl b/docs/upgrades/templates-7.3.0/default-wiki-recent-changes.tmpl
deleted file mode 100644
index 00b98043d..000000000
--- a/docs/upgrades/templates-7.3.0/default-wiki-recent-changes.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-#WikiRCTmpl000000000001
-#create
-#namespace:WikiMaster_recentChanges
-#url:default-wiki-recent-changes
-#title:Default Recent Changes
-#menuTitle:Default Recent Changes
-<h2><tmpl_var title></h2>
-
-<ul><tmpl_loop recentChanges>
-<li><a href="<tmpl_var url>"><tmpl_var title></a> - <tmpl_var actionTaken> on <tmpl_var date> by <tmpl_var username></li>
-</tmpl_loop></ul>
-
-<div style="padding: 8px;"><a href="<tmpl_var searchUrl>"><tmpl_var searchLabel></a> | <a href="<tmpl_var mostPopularUrl>"><tmpl_var mostPopularLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>
-
diff --git a/docs/upgrades/templates-7.3.0/default-wiki-search.tmpl b/docs/upgrades/templates-7.3.0/default-wiki-search.tmpl
deleted file mode 100644
index 121e94a32..000000000
--- a/docs/upgrades/templates-7.3.0/default-wiki-search.tmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-#WikiSearchTmpl00000001
-#create
-#namespace:WikiMaster_search
-#url:default-wiki-search
-#title:Default Wiki Search
-#menuTitle:Default Wiki Search
-<tmpl_if displayTitle><h2><tmpl_var searchLabel></h2></tmpl_if>
-
-
-<tmpl_var searchFormHeader><tmpl_var searchQuery><tmpl_var searchSubmit><tmpl_var searchFormFooter>
-<tmpl_if performSearch>
-	<h3><tmpl_var resultsLabel></h3>
-	<tmpl_if searchResults>
-		<ul><tmpl_loop searchResults><li><a href="<tmpl_var url>"><tmpl_var title></a></li></tmpl_loop></ul>
-		<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination">
-			<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-		</div>
-		</tmpl_if>
-	<p><tmpl_var notWhatYouWanted></p>
-		<p><a href="<tmpl_var addPageUrl>"><tmpl_var addPageLabel></a></p>
-	<tmpl_else>
-		<p><tmpl_var nothingFoundLabel></p>
-		<p><a href="<tmpl_var addPageUrl>"><tmpl_var addPageLabel></a></p>
-	</tmpl_if>
-</tmpl_if>
-<div style="padding: 8px;"><a href="<tmpl_var mostPopularUrl>"><tmpl_var mostPopularLabel></a> | <a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>
-
diff --git a/docs/upgrades/templates-7.3.1/CalendarDay.tmpl b/docs/upgrades/templates-7.3.1/CalendarDay.tmpl
deleted file mode 100755
index 3f036de4c..000000000
--- a/docs/upgrades/templates-7.3.1/CalendarDay.tmpl
+++ /dev/null
@@ -1,271 +0,0 @@
-#CalendarDay00000000001
-<tmpl_if admin>
-	<p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL">
-<tr>
-	<td style="text-align:right">
-		<a href="<tmpl_var urlDay>" class="tab active">Day</a>
-		<a href="<tmpl_var urlWeek>" class="tab">Week</a>
-		<a href="<tmpl_var urlMonth>" class="tab">Month</a>
-		<a href="<tmpl_var urlSearch>" class="tab">Search</a>
-		
-		<div class="controls">
-			<tmpl_if editor><a href="<tmpl_var urlAdd>">Add Event</a></tmpl_if>
-			<!--&bull; <a href="#">Print</a> 
-			&bull; <a href="#">Subscribe</a>-->
-		</div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="padding:3px 0px;">
-			<a href="<tmpl_var pagePrevUrl>" style="font-weight:bold;margin-right:8px;">&laquo; Previous Day
-			</a>&bull;
-			
-			<span style="margin-right:8px;margin-left:8px;" class="monthLink current"><tmpl_var dayAbbr>, <tmpl_var monthAbbr> <tmpl_var dayOfMonth>. <tmpl_var year></span>&bull;
-			<a href="<tmpl_var pageNextUrl>" style="font-weight:bold;padding-left:8px">Next Day &raquo;</a>	 
-		</div>
-	</td>
-</tr>
-<tr>
-	<td>
-		<div  class="curMonth">
-			<tmpl_var dayName>, <tmpl_var monthName> <tmpl_var dayOfMonth>, <tmpl_var year>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tmpl_loop hours><tr>
-			<td class="heading">
-				<div style="padding:4px;"><tmpl_var hour12>:00<tmpl_var hourM></div>
-			</td>
-			<td class="day">							
-				<ul class="eventList">
-					<tmpl_loop events><li>
-					<a href="/<tmpl_var eventUrl>"><tmpl_var eventTitle></a>
-					</tmpl_loop></li>
-				</ul>				
-			</td>
-		</tr></tmpl_loop>
-		</table>		
-	</td>
-</tr>
-</table>
-~~~
-	<style type="text/css">
-		/* Edited with EditCSS */
-
-/**** Inline STYLE-tag style sheet ****/
-
-		#mCAL * {
-			margin:0px;
-		}
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style:none;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#E9ECF3;
-			-moz-border-radius-topLeft:10px;
-			-moz-border-radius-topRight:10px;
-			color:#7588B5;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL .controls {
-			float:right;
-			vertical-align:bottom;
-		}
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .heading {
-			width:200px;
-			-moz-box-sizing:border-box;
-			background-color:#ABB7D1;
-			text-align:center;
-			font-weight:bold;
-			color:#374664;
-			font-size:9px;
-			letter-spacing:1px;
-			text-transform:uppercase;
-			text-align:right;
-			vertical-align:top;
-			-moz-border-radius-bottomRight:8px;
-			-moz-border-radius-topRight:8px;			
-		}
-		#mCAL .day {
-			background-color:#E9ECF3;			
-			width:400px;
-			position:relative;
-			vertical-align:top;		
-			-moz-border-radius-topLeft:8px;
-			-moz-border-radius-bottomLeft:8px;			
-			border:solid #CCD2E3 1px;
-		}
-		#mCAL .curDay {
-			background-color:#FFE4B3;
-			border-color:orange;
-		}
-		#mCAL .dayWrapper {			
-			height:100%;
-			width:100%;
-			position:relative;
-			z-index:0;
-			margin:0px;	
-			padding:0px 0px 2px 5px;;
-			-moz-box-sizing:border-box;
-		}
-		html > body #mCAL .dayWrapper {
-			height:auto;
-			min-height:100%;
-		}
-		#mCAL .dayNum {
-			width:100%;
-			text-align:right;
-			
-		}
-
-		#mCAL span.border {							
-			text-align:center;			
-			padding:5px;
-			font-weight:bold;
-			-moz-border-radius-bottomRight:5px;
-			-moz-border-radius-topLeft:5px;
-			color:black;			
-			border-right:solid #CCD2E3 1px;
-			border-bottom: solid #CCD2E3 1px;
-			background-color:#ABB7D1;
-			-moz-box-sizing:border-box;
-			top:5px;
-			position:relative;
-			
-		}
-		#mCAL .curDay span.border {
-			background-color:orange;
-			color:black;
-			border-color:orange;
-		}
-		#mCAL .event {
-			padding:3px;
-			padding-top:8px;
-			clear:left;
-			font-weight:bold;			
-		}
-		#mCAL .event a {
-			color:#4F4F4F;
-			text-decoration:none;
-			font-size:9px;
-		}
-		#mCAL .moreButton {
-			border-style:none;
-			z-index:5;
-			position:absolute;
-			bottom:0px;
-			width:100%;
-			height:9px;
-			background-color:#517AC8;	
-			font-size:5px;
-			text-align:center;
-		}
-		#mCAL .moreButton:hover {
-			background-color:orange;
-		}
-		#mCAL .empty {
-			border-style:none;
-			background-color:#CCD2E3;
-			-moz-border-radius:10px;
-			
-		}
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;			
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-		#mCAL .months .current {
-			color:#517AC8;
-		}
-		#mCAL .current {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:center;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-		
-		/* MORE STYLES */
-		#more1 {
-			position:absolute;
-			top:170px;
-			left:10px;			
-			
-		}
-		* html #more1 {
-			top:158px;
-			left:12px;
-
-		}
-		.moreDisplay {
-			border:solid orange 1px;
-			border-top:solid orange 2px;
-			font-family:arial;
-			font-size:10px;
-			width:300px;
-			padding:2px;
-			background-color:#FFD3A8;
-			z-index:10;			
-		}
-		ul.eventList {
-			margin:0px;
-			padding:0px;
-			margin-left:30px;
-			color:#526896;
-		}
-	</style>
diff --git a/docs/upgrades/templates-7.3.1/CalendarEvent.tmpl b/docs/upgrades/templates-7.3.1/CalendarEvent.tmpl
deleted file mode 100755
index 2cb1282b5..000000000
--- a/docs/upgrades/templates-7.3.1/CalendarEvent.tmpl
+++ /dev/null
@@ -1,212 +0,0 @@
-#CalendarEvent000000001
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL" border="0">
-<tr>
-	<td style="text-align:right;border-bottom:solid white 1px;">
-		<a href="<tmpl_var urlDay>" class="tab">Day</a>
-		<a href="<tmpl_var urlWeek>" class="tab">Week</a>
-		<a href="<tmpl_var urlMonth>" class="tab">Month</a>
-		<a href="<tmpl_var urlSearch>" class="tab">Search</a>
-		
-		<div class="controls">
-			<a href="?func=edit">Edit</a> &bull; <a href="?func=delete">Delete</a>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="float: left;"><a href="<tmpl_var prevUrl>">&lt;&lt; Previous Event</a></div>
-		<div style="float: right;"><a href="<tmpl_var nextUrl>">Next Event &gt;&gt;</a></div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		Event Details
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Event Title</div>
-			</td>
-			<td class="day">	
-				<div class="eventWrapper">
-					<tmpl_var title>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Location</div>
-			</td>
-			<td class="day">	
-				<div class="eventWrapper">
-					<tmpl_var location>
-				</div>
-			</td>
-		</tr>
-		
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Description</div>
-			</td>
-			<td class="day">							
-				<div class="eventWrapper"><tmpl_var description></div>
-			</td>
-		</tr>
-
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Scheduled</div>
-			</td>
-			<td class="day">							
-				<div class="eventWrapper">
-					<tmpl_var startDateDayName>,
-					<tmpl_var startDateMonthName>
-					<tmpl_var startDateDayOfMonth>
-					<tmpl_var startDateHour>:<tmpl_var startDateMinute> <tmpl_var startDateM> &bull; <tmpl_var endDateDayName>, 
-					<tmpl_var endDateMonthName>
-					<tmpl_var endDateDayOfMonth>
-					<tmpl_var endDateHour>:<tmpl_var endDateMinute> <tmpl_var endDateM>
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Related Material</div>
-			</td>
-			<td class="day">								<div class="eventWrapper"><tmpl_loop relatedLinks>
-				<a href="<tmpl_var link.url>"><tmpl_var linkUrl></a><br />
-				</tmpl_loop></div>
-			</td>
-		</tr>
-	
-		</table>
-	</td>
-</tr>
-</table>
-~~~
-	<style type="text/css">
-		/* Edited with EditCSS */
-
-/**** Inline STYLE-tag style sheet ****/
-
-		body * {
-			margin:0px;
-		}	
-		#mCAL {
-			
-		}
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style:none;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#E9ECF3;
-			-moz-border-radius-topLeft:10px;
-			-moz-border-radius-topRight:10px;
-			color:#7588B5;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .heading {
-			width:200px;
-			-moz-box-sizing:border-box;
-			background-color:#ABB7D1;
-			text-align:center;
-			font-weight:bold;
-			color:#374664;
-			font-size:9px;
-			letter-spacing:1px;
-			text-transform:uppercase;
-			text-align:right;
-			vertical-align:top;
-			-moz-border-radius-bottomRight:8px;
-			-moz-border-radius-topRight:8px;			
-		}
-		#mCAL .day {
-			background-color:#E9ECF3;			
-			width:400px;
-			position:relative;
-			vertical-align:top;		
-			-moz-border-radius-topLeft:8px;
-			-moz-border-radius-bottomLeft:8px;			
-			border:solid #CCD2E3 1px;
-		}
-
-		
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;	
-			color:#3E4D75;
-			font-size:14px;
-			font-weight:bold;
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-		#mCAL .months .current {
-			color:#517AC8;
-		}
-		#mCAL .current {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:center;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-
-		#mCAL .searchField {
-			margin: 2px 10px;
-			border:solid #ABB7D1 1px;
-		}
-		#mCAL .searchBtn {
-			background-color: #ABB7D1;
-			border:solid #CCD2E3 1px;
-			color:white;
-			font-weight:bold;
-			cursor:pointer;
-		}
-		
-		#mCAL .eventWrapper {
-			margin:2px 10px;
-		}
-	</style>
diff --git a/docs/upgrades/templates-7.3.1/CalendarEventEdit.tmpl b/docs/upgrades/templates-7.3.1/CalendarEventEdit.tmpl
deleted file mode 100755
index 45bb326bf..000000000
--- a/docs/upgrades/templates-7.3.1/CalendarEventEdit.tmpl
+++ /dev/null
@@ -1,164 +0,0 @@
-#CalendarEventEdit00001
-<tmpl_var formHeader>
-
-<tmpl_if formErrors>
-<h1>Errors!</h1>
-<ul>
-<tmpl_loop formErrors>
-	<li><tmpl_var message></li>
-</tmpl_loop>
-</ul>
-</tmpl_if>
-
-<table id="tabs" cellpadding="0" cellspacing="0" border="0">
-<tr>
-	<td style="text-align:left;">
-		<a href="#" id="tab_event" onclick="toggleTab('event'); return false;" class="tab active">Event</a>
-		<a href="#" id="tab_recursion" onclick="toggleTab('recursion'); return false;" class="tab">Recurrence</a>
-		<tmpl_var formSave>
-		<tmpl_var formCancel>
-	</td>
-</tr>
-</table>
-
-<!-- Event tab -->
-<table id="event" cellpadding="0" cellspacing="0" border="0">
-<tr>
-	<td class="border" style="text-align:left;width:700px">
-		<table cellpadding="2" style="margin:5px;">
-		<tr>
-			<td class="label" style="text-align:right">Event Title</td>
-			<td><tmpl_var formTitle></td>
-		</tr>
-		<tr>
-			<td class="label" style="text-align:right">Short Title</td>
-			<td><tmpl_var formMenuTitle></td>
-		</tr>
-		<tr>
-			<td class="label" style="text-align:right">Location</td>
-			<td><tmpl_var formLocation></td>
-		</tr>	
-		<tr>
-			<td class="label" style="text-align:right;vertical-align:top">Description</td>
-			<td><tmpl_var formDescription></td>
-		</tr>
-		<tr>
-			<td class="label" style="text-align:right;vertical-align:top">Start Date</td>
-			<td><tmpl_var formStartDate></td>
-		</tr>	
-		<tr>
-			<td class="label" style="text-align:right;vertical-align:top">End Date</td>
-			<td><tmpl_var formEndDate></td>
-		</tr>
-		<tr>
-			<td class="label" style="text-align:right;vertical-align:top">Time</td>
-			<td><tmpl_var formTime></td>
-		</tr>
-		
-		<tr><td colspan="2">&nbsp;</td></tr>
-		<tr>
-			<td class="label" style="text-align:right;vertical-align:top;">Related Links</td>
-			<td><tmpl_var formRelatedLinks></td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-
-<table style="display: none; margin: 5px;" id="recursion" cellpadding="2" cellspacing="0" border="0">
-<tr>
-	<td class="label" style="text-align:right;vertical-align:top">Recurrence Pattern</td>
-	<td><tmpl_var formRecurPattern></td>
-</tr>
-<tr>
-	<td class="label" style="text-align:right;vertical-align:top">Recurrence Range</td>
-	<td>
-		<p style="float: left; margin: 5px;">Start:</p> 
-		<div style="float: left; margin: 5px;"><tmpl_var formRecurStart></div><br/>
-		<p style="float: left; clear: left; margin: 5px;">End:</p>
-		<div style="float: left; margin: 5px;"><tmpl_var formRecurEnd></div>
-	</td>
-</tr>
-<!--<tr>
-	<td class="label" style="text-align:right;vertical-align:top">Include Dates</td>
-	<td><tmpl_var formRecurInclude></td>
-</tr>
-<tr>
-	<td class="label" style="text-align:right;vertical-align:top">Exclude Dates</td>
-	<td><tmpl_var formRecurExclude></td>
-</tr>-->
-</table>
-
-<tmpl_var formFooter>
-
-<script type="text/javascript">
-var old_tab = document.getElementById("event");
-function toggleTab(id) 
-{
-	if (old_tab)
-	{
-		old_tab.style.display = "none";
-		document.getElementById("tab_"+old_tab.getAttribute("id")).className = "tab";
-	}
-	element = document.getElementById(id);
-	element.style.display = "block";
-	document.getElementById("tab_"+id).className = "tab active";
-	old_tab = element;
-}
-</script>
-~~~
-<script src="/extras/yui/build/yahoo/yahoo.js" type="text/javascript"></script>
-<script src="/extras/yui/build/event/event.js" type="text/javascript"></script>
-<script src="/extras/yui/build/dom/dom.js" type="text/javascript"></script>
-<script src="/extras/yui/build/dragdrop/dragdrop.js" type="text/javascript"></script>
-<script src="/extras/yui/build/logger/logger.js" type="text/javascript"></script>
-<script src="/extras/yui-ext/yui-ext-core.js" type="text/javascript"></script>
-<script src="/extras/yui-ext/resizable-lib.js" type="text/javascript"></script>
-<link href="/extras/yui-ext/resources/css/resizable.css" rel="stylesheet" type="text/css" />
-<script src="/extras/textFix.js" type="text/javascript"></script>
-
-<script src="/extras/tinymce2/jscripts/tiny_mce/tiny_mce.js" type="text/javascript"></script>
-<script src="/extras/tinymce2/jscripts/webgui.js" type="text/javascript"></script>
-<script src="/extras/tabs/tabs.js" type="text/javascript"></script>
-	<style type="text/css">
-		body * {
-			margin:0px;
-		}
-		table td {
-			font-family:Arial;			
-			font-size:10px;
-		}
-		#tabs a {
-			border:solid #F0F0F0 1px;
-			-moz-border-radius-topLeft: 20px;
-			-moz-border-radius-topRight: 20px;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#FBFBFB;
-			border-top:solid #F0F0F0 2px;
-			color:#b0b0b0;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#tabs a:hover {
-			color:black;
-		}
-		#tabs .active {
-			background-color:#F0F0F0;
-			color:#404040;
-		}
-		table a {
-			font-size:11px;
-			color:#447BFD;
-		}
-		input {
-			font-size:10px;
-			border:gray solid 1px;
-			background-color:#F0F0F0;
-			cursor:pointer;
-		}
-	</style>
diff --git a/docs/upgrades/templates-7.3.1/CalendarMonth.tmpl b/docs/upgrades/templates-7.3.1/CalendarMonth.tmpl
deleted file mode 100755
index 792d60054..000000000
--- a/docs/upgrades/templates-7.3.1/CalendarMonth.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/docs/upgrades/templates-7.3.1/CalendarSearch.tmpl b/docs/upgrades/templates-7.3.1/CalendarSearch.tmpl
deleted file mode 100755
index 20d33c444..000000000
--- a/docs/upgrades/templates-7.3.1/CalendarSearch.tmpl
+++ /dev/null
@@ -1,318 +0,0 @@
-#CalendarSearch00000001
-<tmpl_if admin>
-	<p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-
-<tmpl_var form.header>
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL" border="0">
-<tr>
-	<td style="text-align:right">
-		<a href="/<tmpl_var url>?type=day" class="tab">Day</a>
-		<a href="/<tmpl_var url>?type=week" class="tab">Week</a>
-		<a href="/<tmpl_var url>?type=month" class="tab">Month</a>
-		<a href="/<tmpl_var url>?func=search" class="tab active">Search</a>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		&nbsp;
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Keyword</div>
-			</td>
-			<td class="day">							<tmpl_var form.keywords>
-			</td>
-		</tr>
-		
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Start Date</div>
-			</td>
-			<td class="day">							<tmpl_var form.startDate>	
-			</td>
-		</tr>
-
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">End Date</div>
-			</td>
-			<td class="day">							<tmpl_var form.endDate>
-			</td>
-		</tr>
-
-		</table>
-	</td>
-</tr>
-<tr>
-	<td style="text-align:right">
-	<tmpl_var form.submit>
-	</td>
-</tr>
-</table>
-<tmpl_var form.footer>
-
-
-
-<tmpl_if results>
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL">
-<tr>
-	<td>
-		<div  class="curMonth">
-			Search Results
-			<span style="font-size:9px;">Displaying page <tmpl_var pagination.pageCount> of <tmpl_var pagination.pageCount></span>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="padding:3px 0px;">			
-			<tmpl_var pagination.firstPage>
-			<tmpl_var pagination.pageList>
-			<tmpl_var pagination.lastPage>	 
-		</div>
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tmpl_loop results><tr>
-			<td class="heading">
-				<div style="padding:4px;"><tmpl_var startDate></div>
-			</td>
-			<td class="day">
-				<a href="/<tmpl_var url>" style="padding-left:10px"><tmpl_var title></a>
-			</td>
-		</tr></tmpl_loop>
-		</table>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="padding:3px 0px;">
-			<tmpl_var pagination.firstPage>
-			<tmpl_var pagination.pageList>
-			<tmpl_var pagination.lastPage>	 
-		</div>
-	</td>
-</tr>
-</table>
-</tmpl_if>
-~~~
-	<style type="text/css">
-		body * {
-			margin:0px;
-		}	
-		#mCAL {
-			
-		}
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style:none;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#E9ECF3;
-			-moz-border-radius-topLeft:10px;
-			-moz-border-radius-topRight:10px;
-			color:#7588B5;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL .controls {
-			float:right;
-			vertical-align:bottom;
-		}
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .heading {
-			width:200px;
-			-moz-box-sizing:border-box;
-			background-color:#ABB7D1;
-			text-align:center;
-			font-weight:bold;
-			color:#374664;
-			font-size:9px;
-			letter-spacing:1px;
-			text-transform:uppercase;
-			text-align:right;
-			vertical-align:top;
-			-moz-border-radius-bottomRight:8px;
-			-moz-border-radius-topRight:8px;			
-		}
-		#mCAL .day {
-			background-color:#E9ECF3;			
-			width:400px;
-			position:relative;
-			vertical-align:top;		
-			-moz-border-radius-topLeft:8px;
-			-moz-border-radius-bottomLeft:8px;			
-			border:solid #CCD2E3 1px;
-		}
-		#mCAL .curDay {
-			background-color:#FFE4B3;
-			border-color:orange;
-		}
-		#mCAL .dayWrapper {			
-			height:100%;
-			width:100%;
-			position:relative;
-			z-index:0;
-			margin:0px;	
-			padding:0px 0px 2px 5px;;
-			-moz-box-sizing:border-box;
-		}
-		html > body #mCAL .dayWrapper {
-			height:auto;
-			min-height:100%;
-		}
-		#mCAL .dayNum {
-			width:100%;
-			text-align:right;
-			
-		}
-
-		#mCAL span.border {							
-			text-align:center;			
-			padding:5px;
-			font-weight:bold;
-			-moz-border-radius-bottomRight:5px;
-			-moz-border-radius-topLeft:5px;
-			color:black;			
-			border-right:solid #CCD2E3 1px;
-			border-bottom: solid #CCD2E3 1px;
-			background-color:#ABB7D1;
-			-moz-box-sizing:border-box;
-			top:5px;
-			position:relative;
-			
-		}
-		#mCAL .curDay span.border {
-			background-color:orange;
-			color:black;
-			border-color:orange;
-		}
-		#mCAL .event {
-			padding:3px;
-			padding-top:8px;
-			clear:left;
-			font-weight:bold;			
-		}
-		#mCAL .event a {
-			color:#4F4F4F;
-			text-decoration:none;
-			font-size:9px;
-		}
-		#mCAL .moreButton {
-			border-style:none;
-			z-index:5;
-			position:absolute;
-			bottom:0px;
-			width:100%;
-			height:9px;
-			background-color:#517AC8;	
-			font-size:5px;
-			text-align:center;
-		}
-		#mCAL .moreButton:hover {
-			background-color:orange;
-		}
-		#mCAL .empty {
-			border-style:none;
-			background-color:#CCD2E3;
-			-moz-border-radius:10px;
-			
-		}
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;			
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-		#mCAL .months .current {
-			color:#517AC8;
-		}
-		#mCAL .current {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:left;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-		
-		/* MORE STYLES */
-		#more1 {
-			position:absolute;
-			top:170px;
-			left:10px;			
-			
-		}
-		* html #more1 {
-			top:158px;
-			left:12px;
-
-		}
-		.moreDisplay {
-			border:solid orange 1px;
-			border-top:solid orange 2px;
-			font-family:arial;
-			font-size:10px;
-			width:300px;
-			padding:2px;
-			background-color:#FFD3A8;
-			z-index:10;			
-		}
-		ul.eventList {
-			margin:0px;
-			padding:0px;
-			margin-left:30px;
-			color:#526896;
-		}
-	</style>
diff --git a/docs/upgrades/templates-7.3.1/CalendarWeek.tmpl b/docs/upgrades/templates-7.3.1/CalendarWeek.tmpl
deleted file mode 100755
index 66480700f..000000000
--- a/docs/upgrades/templates-7.3.1/CalendarWeek.tmpl
+++ /dev/null
@@ -1,263 +0,0 @@
-#CalendarWeek0000000001
-<tmpl_if admin>
-	<p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL">
-<tr>
-	<td style="text-align:right">
-		<a href="<tmpl_var urlDay>" class="tab">Day</a> <a href="<tmpl_var urlWeek>" class="tab active">Week</a> <a href="<tmpl_var urlMonth>" class="tab">Month</a> <a href="<tmpl_var urlSearch>" class="tab">Search</a>
-		<div class="controls">
-			<a href="<tmpl_var urlAdd>">Add Event</a> <!--&bull; <a href="#">Print</a> &bull; <a href="#">Subscribe</a>-->
-		</div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="padding:3px 0px;">
-			<a href="<tmpl_var pagePrevUrl>" style="font-weight:bold;margin-right:8px;">&laquo; Previous Week
-			</a>&bull;
-			
-			<a href="#" onclick="return false;" style="margin-right:8px;margin-left:8px;" class="monthLink current"><tmpl_var startMonthAbbr> <tmpl_var startDayOfMonth> <tmpl_var startYear>&nbsp;&nbsp;-&nbsp;&nbsp;<tmpl_var endMonthAbbr> <tmpl_var endDayOfMonth> <tmpl_var endYear></a>&bull;
-			<a href="<tmpl_var pageNextUrl>" style="font-weight:bold;padding-left:8px">Next Week &raquo;</a>	 
-		</div>
-	</td>
-</tr>
-<tr>
-	<td>
-		<div  class="curMonth">
-			<tmpl_var startMonthName> <tmpl_var startDayOfMonth>, <tmpl_var startYear> to <tmpl_var endMonthName> <tmpl_var endDayOfMonth>, <tmpl_var endYear>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tmpl_loop days><tr>
-			<td class="heading">
-				<div style="padding:4px;"><tmpl_var dayName></div>
-			</td>
-			<td class="day<tmpl_if dayCurrent> curDay</tmpl_if>">			
-				<span class="border"><tmpl_var dayOfMonth></span>
-				<ul class="eventList"><tmpl_loop events>
-				<li><a href="<tmpl_var eventUrl>"><tmpl_var eventTitle></a></li>
-				</tmpl_loop></ul>
-				<br />
-			</td>
-		</tr></tmpl_loop>
-		</table>
-	</td>
-</tr>
-</table>
-~~~
-<style type="text/css">
-		#mCAL * {
-			/*margin:0px;*/
-		}
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style:none;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#E9ECF3;
-			-moz-border-radius-topLeft:10px;
-			-moz-border-radius-topRight:10px;
-			color:#7588B5;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL .controls {
-			float:right;
-			vertical-align:bottom;
-		}
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .heading {
-			width:200px;
-			-moz-box-sizing:border-box;
-			background-color:#ABB7D1;
-			text-align:center;
-			font-weight:bold;
-			color:#374664;
-			font-size:9px;
-			letter-spacing:1px;
-			text-transform:uppercase;
-			text-align:right;
-			vertical-align:top;
-			-moz-border-radius-bottomRight:8px;
-			-moz-border-radius-topRight:8px;			
-		}
-		#mCAL .day {
-			background-color:#E9ECF3;			
-			width:400px;
-			position:relative;
-			vertical-align:top;		
-			-moz-border-radius-topLeft:8px;
-			-moz-border-radius-bottomLeft:8px;			
-			border:solid #CCD2E3 1px;
-		}
-		#mCAL .curDay {
-			background-color:#FFE4B3;
-			border-color:orange;
-		}
-		#mCAL .dayWrapper {			
-			height:100%;
-			width:100%;
-			position:relative;
-			z-index:0;
-			margin:0px;	
-			padding:0px 0px 2px 5px;;
-			-moz-box-sizing:border-box;
-		}
-		html > body #mCAL .dayWrapper {
-			height:auto;
-			min-height:100%;
-		}
-		#mCAL .dayNum {
-			width:100%;
-			text-align:right;
-			
-		}
-
-		#mCAL span.border {							
-			text-align:center;			
-			padding:5px;
-			font-weight:bold;
-			-moz-border-radius-bottomRight:5px;
-			-moz-border-radius-topLeft:5px;
-			color:black;			
-			border-right:solid #CCD2E3 1px;
-			border-bottom: solid #CCD2E3 1px;
-			background-color:#ABB7D1;
-			-moz-box-sizing:border-box;
-			top:5px;
-			position:relative;
-			
-		}
-		#mCAL .curDay span.border {
-			background-color:orange;
-			color:black;
-			border-color:orange;
-		}
-		#mCAL .event {
-			padding:3px;
-			padding-top:8px;
-			clear:left;
-			font-weight:bold;			
-		}
-		#mCAL .event a {
-			color:#4F4F4F;
-			text-decoration:none;
-			font-size:9px;
-		}
-		#mCAL .moreButton {
-			border-style:none;
-			z-index:5;
-			position:absolute;
-			bottom:0px;
-			width:100%;
-			height:9px;
-			background-color:#517AC8;	
-			font-size:5px;
-			text-align:center;
-		}
-		#mCAL .moreButton:hover {
-			background-color:orange;
-		}
-		#mCAL .empty {
-			border-style:none;
-			background-color:#CCD2E3;
-			-moz-border-radius:10px;
-			
-		}
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;			
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-		#mCAL .months .current {
-			color:#517AC8;
-		}
-		#mCAL .current {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:center;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-		
-		/* MORE STYLES */
-		#more1 {
-			position:absolute;
-			top:170px;
-			left:10px;			
-			
-		}
-		* html #more1 {
-			top:158px;
-			left:12px;
-
-		}
-		.moreDisplay {
-			border:solid orange 1px;
-			border-top:solid orange 2px;
-			font-family:arial;
-			font-size:10px;
-			width:300px;
-			padding:2px;
-			background-color:#FFD3A8;
-			z-index:10;			
-		}
-		ul.eventList {
-			margin:0px;
-			padding:0px;
-			margin-left:50px;
-			color:#526896;
-		}
-
-
-</style>
diff --git a/docs/upgrades/templates-7.3.1/inOutReportTemplate.tmpl b/docs/upgrades/templates-7.3.1/inOutReportTemplate.tmpl
deleted file mode 100644
index f2e3e4c86..000000000
--- a/docs/upgrades/templates-7.3.1/inOutReportTemplate.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-#IOB0000000000000000002
-#namespace:InOutBoard/Report
-<h2><tmpl_var reportTitle></h2>
-<div class="iob">
-   <tmpl_var form><br />
-   <tmpl_if showReport>
-   <table width="100%" cellpadding="3" cellspacing="0">
-   <tr>
-   <th><tmpl_var username.label></th>
-   <th><tmpl_var status.label></th>
-   <th><tmpl_var date.label></th>
-   <th><tmpl_var message.label></th>
-   <th><tmpl_var updatedBy.label></th>
-   </tr>
-   <tmpl_loop rows_loop>
-   <tmpl_if deptHasChanged>
-   <tr><td colspan="5"><b><tmpl_var department></b></td></tr>
-   </tmpl_if>
-   <tr>
-   <td><tmpl_var username></td>
-   <td><tmpl_var status></td>
-   <td><tmpl_var dateStamp></td>
-   <td><tmpl_var message></td>
-   <td><tmpl_var createdBy></td>
-   </tr>
-   </tmpl_loop>
-   <tr><td colspan="5"><tmpl_var paginateBar></td></tr>
-   </table>
-   </tmpl_if>
-</div>
-
-
-
diff --git a/docs/upgrades/templates-7.3.1/inOutTemplate.tmpl b/docs/upgrades/templates-7.3.1/inOutTemplate.tmpl
deleted file mode 100644
index c23a0340e..000000000
--- a/docs/upgrades/templates-7.3.1/inOutTemplate.tmpl
+++ /dev/null
@@ -1,51 +0,0 @@
-#IOB0000000000000000001
-#namespace:InOutBoard
-<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> 
-
-<div class="fontSettings">
-	<tmpl_var description>
-	<br /><br />
-</div>
-
-<div class="pagination">
-<tmpl_if selectDelegatesURL>
-   <a href="<tmpl_var selectDelegatesURL>"><tmpl_var selectDelegatesLabel></a>
-</tmpl_if>
-<tmpl_if canViewReport>
-   <tmpl_if selectDelegatesURL>
-      &nbsp;&middot;&nbsp;
-   </tmpl_if>
-   <a href="<tmpl_var viewReportURL>"><tmpl_var reportTitleLabel></a>
-</tmpl_if>
-</div>
-
-<tmpl_if displayForm>	
-	<div class="fontSettings">
-		<tmpl_var form>
-	</div>	
-</tmpl_if>
-   
-   <table width="100%" cellpadding="3" cellspacing="0" class="iob">
-   <tmpl_loop rows_loop>
-   <tmpl_if deptHasChanged>
-   <tr><td colspan="4" class="noBorder"><br /><b><tmpl_var department></b></td></tr>
-   </tmpl_if>
-   <tr>
-   <td<tmpl_if __ODD__> class="odd"</tmpl_if>><tmpl_var username></td>
-   <td<tmpl_if __ODD__> class="odd"</tmpl_if>><tmpl_var status></td>
-   <td<tmpl_if __ODD__> class="odd"</tmpl_if>><tmpl_var dateStamp></td>
-   <td<tmpl_if __ODD__> class="odd"</tmpl_if>><tmpl_var message></td>
-   </tr>
-   </tmpl_loop>
-   <tr><td colspan="4"><tmpl_var paginateBar></td></tr>
-   </table>
-   
-   
-
diff --git a/docs/upgrades/templates-7.3.10/auth-webgui-createAccount.tmpl b/docs/upgrades/templates-7.3.10/auth-webgui-createAccount.tmpl
deleted file mode 100644
index ea636c5e3..000000000
--- a/docs/upgrades/templates-7.3.10/auth-webgui-createAccount.tmpl
+++ /dev/null
@@ -1,59 +0,0 @@
-#PBtmpl0000000000000011
-<h2><tmpl_var title></h2>
-
-<tmpl_if create.message>
-   <tmpl_var create.message>
-</tmpl_if>
-
-<tmpl_var create.form.header>
-<tmpl_var create.form.hidden>
-<table >
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var create.form.username.label></td>
-   <td class="tableData"><tmpl_var create.form.username></td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var create.form.password.label></td>
-   <td class="tableData"><tmpl_var create.form.password></td>
-</tr>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var create.form.passwordConfirm.label></td>
-   <td class="tableData"><tmpl_var create.form.passwordConfirm></td>
-</tr>
-<tmpl_loop create.form.profile>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var profile.formElement.label></td>
-   <td class="tableData"><tmpl_var profile.formElement></td>
-</tr>
-</tmpl_loop>
-<tmpl_if useCaptcha>
-<tr>
-   <td class="formDescription" valign="top"><tmpl_var create.form.captcha.label></td>
-   <td class="tableData"><tmpl_var create.form.captcha></td>
-</tr>
-</tmpl_if>
-<tr>
-    <td colspan="2">&nbsp;</td>
-</tr>
-<tr>
-   <td class="submitData" colspan="2"><tmpl_var create.form.submit></td>
-</tr>
-</table>
-<tmpl_var create.form.footer>
-
-<div class="accountOptions">
-   <ul>
-      <li><a href="<tmpl_var login.url>"><tmpl_var login.label></a></li>
-      <tmpl_if recoverPassword.isAllowed>
-         <li><a href="<tmpl_var recoverPassword.url>"><tmpl_var recoverPassword.label></a></li>
-      </tmpl_if>
-   </ul>
-</div>
-~~~
-<style type="text/css">
-    .submitData {
-        text-align:right;
-        border-top:solid gray 1px;
-    }
-</style>
-
diff --git a/docs/upgrades/templates-7.3.12/PBtmpl0000000000000125.tmpl b/docs/upgrades/templates-7.3.12/PBtmpl0000000000000125.tmpl
deleted file mode 100644
index 413cecbf7..000000000
--- a/docs/upgrades/templates-7.3.12/PBtmpl0000000000000125.tmpl
+++ /dev/null
@@ -1,90 +0,0 @@
-#PBtmpl0000000000000125
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if showAdmin>
-<p><tmpl_var controls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-  <h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-  <p><tmpl_var description></p>
-</tmpl_if>
-
-<!-- begin position 1 -->
-<div class="firstColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position1" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position1_loop>
-	<tmpl_if showAdmin>
-            	<tr id="td<tmpl_var id>">
-            		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-         			</div></td>
-            	</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-            </tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 1 -->
-
-<!-- begin position 2 -->
-<div class="secondColumn"><div class="layoutColumnPadding">
-<tmpl_if showAdmin>
-	<table border="0" id="position2" class="content"><tbody>
-</tmpl_if>
-
-<tmpl_loop position2_loop>
-	<tmpl_if showAdmin>
-            	<tr id="td<tmpl_var id>">
-            		<td><div id="td<tmpl_var id>_div" class="dragable">
-	</tmpl_if>
-
-	<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
-
-	<tmpl_if showAdmin>
-         			</div></td>
-            	</tr>
-	</tmpl_if>
-</tmpl_loop>
-
-<tmpl_if showAdmin>
-            </tbody></table>
-</tmpl_if>
-</div></div>
-<!-- end position 2 -->
-
-<div class="endFloat">&nbsp;</div>
-
-<tmpl_if showAdmin>
-	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
-            <tmpl_var dragger.init>
-</tmpl_if>
-~~~
-<style type="text/css">
-.firstColumn {
-  float: left;
-  width: 33%;
-}
-.secondColumn {
-        float: left;
-        width: auto;
-        max-width: 65%;
-}
-.endFloat {
- clear: both;
-}
-</style>
-
-
diff --git a/docs/upgrades/templates-7.3.13/PBtmpl0000000000000114.tmpl b/docs/upgrades/templates-7.3.13/PBtmpl0000000000000114.tmpl
deleted file mode 100644
index f04328cd3..000000000
--- a/docs/upgrades/templates-7.3.13/PBtmpl0000000000000114.tmpl
+++ /dev/null
@@ -1,103 +0,0 @@
-#PBtmpl0000000000000114
-#title:Link List Submission Form
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<div class="linkSubmissionFormContent">
-	<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
-	<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
-	<tmpl_if preview.userDefined1><p><a href="<tmpl_var preview.userDefined1>" <tmpl_if preview.userDefined2>target="_blank"</tmpl_if>><tmpl_var preview.userDefined1></a></p></tmpl_if>
-</div>
-
-<tmpl_if isReply>
-	<h2><tmpl_var message.header.label></h2>
-<tmpl_else>
-	<h2><tmpl_var link.header.label></h2>
-</tmpl_if>
-
-<tmpl_var form.header>
-<table class="linkSubmissionForm">
-	<tmpl_if isReply>
-		<tr>
-			<td><tmpl_var subject.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var message.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-	<tmpl_else>
-		<tr>
-			<td><tmpl_var title.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var url.label></td>
-			<td><tmpl_var userDefined1.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var newWindow.label></td>
-			<td><tmpl_var userDefined2.form.yesNo></td>
-		</tr>
-		<tr>
-			<td><tmpl_var description.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-		<tmpl_if attachment.form>
-			<tr>
-				<td><tmpl_var attachment.label></td>
-				<td><tmpl_var attachment.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<div class="linkSubmissionFormContent">
-		<b><tmpl_var reply.title></b><br /><br />
-		<tmpl_var reply.content>
-		<tmpl_if reply.userDefined1><p><a href="<tmpl_var reply.userDefined1>" <tmpl_if reply.userDefined2>target="_blank"</tmpl_if>><tmpl_var reply.userDefined1></a></p></tmpl_if>
-	</div>
-</tmpl_if>
-~~~
-<style type="text/css">
-table.linkSubmissionForm td
-{
-	font-family:arial;
-	font-size:9pt;
-}
-.linkSubmissionFormContent
-{
-	font-family:arial;
-	font-size:9pt;
-}
-h2
-{
-	font-family:arial;
-}
-
-</style>
diff --git a/docs/upgrades/templates-7.3.14/calendar_day.tmpl b/docs/upgrades/templates-7.3.14/calendar_day.tmpl
deleted file mode 100644
index bb408b1f1..000000000
--- a/docs/upgrades/templates-7.3.14/calendar_day.tmpl
+++ /dev/null
@@ -1,65 +0,0 @@
-#CalendarDay00000000001
-<tmpl_if admin>
-    <p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-    <h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-    <p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL">
-<tr>
-    <td style="text-align:right">
-        <a href="<tmpl_var urlDay>" class="tab active">Day</a>
-        <a href="<tmpl_var urlWeek>" class="tab">Week</a>
-        <a href="<tmpl_var urlMonth>" class="tab">Month</a>
-        <a href="<tmpl_var urlSearch>" class="tab">Search</a>
-        
-        <div class="controls">
-            <tmpl_if editor><a href="<tmpl_var urlAdd>">Add Event</a> &bull;</tmpl_if>
-            <a href="<tmpl_var urlPrint>">Print</a> &bull; <a href="<tmpl_var urlIcal>">iCal</a><!--&bull; <a href="#">Subscribe</a>-->
-        </div>
-    </td>
-</tr>
-<tr>
-    <td class="months">
-        <div style="padding:3px 0px;">
-            <a href="<tmpl_var pagePrevUrl>" style="font-weight:bold;margin-right:8px;">&laquo; Previous Day
-            </a>&bull;
-            
-            <span style="margin-right:8px;margin-left:8px;" class="monthLink current"><tmpl_var dayAbbr>, <tmpl_var monthAbbr> <tmpl_var dayOfMonth>. <tmpl_var year></span>&bull;
-                <a href="<tmpl_var pageNextUrl>" style="font-weight:bold;padding-left:8px">Next Day &raquo;</a> 
-        </div>
-    </td>
-</tr>
-<tr>
-    <td>
-        <div  class="curMonth">
-            <tmpl_var dayName>, <tmpl_var monthName> <tmpl_var dayOfMonth>, <tmpl_var year>
-        </div>
-    </td>
-</tr>
-<tr>
-    <td style="width:100%">
-        <table width="100%" cellspacing="2" cellpadding="0">
-        <tmpl_loop hours><tr>
-            <td class="heading">
-                <div style="padding:4px;"><tmpl_var hour12>:00<tmpl_var hourM></div>
-            </td>
-                                        <td class="day">
-                <ul class="eventList">
-                    <tmpl_loop events><li>
-                    <a href="<tmpl_var eventUrl>"><tmpl_var eventTitle></a>
-                    </tmpl_loop></li>
-                                </ul>
-            </td>
-        </tr></tmpl_loop>
-                </table>
-    </td>
-</tr>
-</table>
-
diff --git a/docs/upgrades/templates-7.3.14/calendar_month.tmpl b/docs/upgrades/templates-7.3.14/calendar_month.tmpl
deleted file mode 100644
index ee6a5b4e1..000000000
--- a/docs/upgrades/templates-7.3.14/calendar_month.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-#CalendarMonth000000001
-<tmpl_if admin>
-    <p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-    <h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-    <tmpl_var description>
-</tmpl_if>
-
-
-<table cellspacing="0" cellpadding="0" width="630" id="mCAL">
-<tr>
-    <td style="text-align:right">
-        <a class="tab" href="<tmpl_var urlDay>">Day</a>
-        <a class="tab" href="<tmpl_var urlWeek>">Week</a>
-        <a class="tab" href="<tmpl_var urlMonth>">Month</a>
-        <a class="tab" href="<tmpl_var urlSearch>">Search</a>
-	
-
-        <div class="controls"><tmpl_if editor><a href="<tmpl_var urlAdd>">Add Event</a></tmpl_if> &bull; <a href="<tmpl_var urlPrint>">Print</a> &bull; <a href="<tmpl_var urlIcal>">iCal </a>
-            <!--&bull; <a href="#">Subscribe</a>-->
-        </div>
-    </td>
-</tr>
-<tr>
-    <td class="months">
-        <div style="padding:3px 0px;">
-            <a href="<tmpl_var pagePrevUrl>" style="font-weight:bold;margin-right:8px;">&laquo; <tmpl_var pagePrevYear></a>&bull;
-            <tmpl_loop months>
-            <a style="margin-right:4px;" href="<tmpl_var monthUrl>" class="monthLink<tmpl_if monthCurrent> current</tmpl_if>"><tmpl_var monthAbbr></a>
-            </tmpl_loop>
-            &bull;
-                <a href="<tmpl_var pageNextUrl>" style="font-weight:bold;padding-left:8px"><tmpl_var pageNextYear> &raquo;</a> 
-        </div>
-    </td>
-</tr>
-<tr>
-    <td>
-        <div  class="curMonth">
-            <tmpl_var monthName> <tmpl_var year>
-        </div>
-    </td>
-</tr>
-<tr>
-    <td style="width:100%">
-    
-    <!-- the calendar table -->
-        <table id="month" width="100%" cellspacing="2" cellpadding="0">
-        <!-- day names -->
-        <tr><tmpl_loop dayNames>
-            <th><tmpl_var dayName></th>
-        </tmpl_loop></tr>
-        
-        <!-- the grid -->
-        <tmpl_loop weeks><tr>
-        <tmpl_loop days><td><div class="<tmpl_if dayMonth>active</tmpl_if><tmpl_if dayCurrent> current</tmpl_if>">
-            <tmpl_if dayMonth>
-               <a class="number" href="<tmpl_var dayUrl>"><tmpl_var dayMonth></a>
-            <tmpl_if events>
-            <ul class="events">
-			   <tmpl_loop events>
-                <li><a href="<tmpl_var eventUrl>">
-		<tmpl_var eventMenuTitle>
-                </a>
-				</li>
-                </tmpl_loop>
-		    </ul>
-			
-			<a href="#" id="event_<tmpl_var dayMonth>" class="moreButton" onmouseover="return showEvents('overlay<tmpl_var dayMonth>');">
-				<img src="<tmpl_var extrasUrl>/wobject/Calendar/images/more.gif" />
-			</a>
-			
-            </tmpl_if> <!--/events-->
-            </tmpl_if> <!--/day-->
-        </div></td></tmpl_loop> <!--/days-->
-        </tr></tmpl_loop>
-    </table>
-</tr>
-</table>
-<tmpl_loop weeks><tmpl_loop days><tmpl_if events>
-      <div id="overlay<tmpl_var dayMonth>" class="moreDisplay">
-         <div>
-            <ul>
-			<tmpl_loop events>
-			<li><a href="<tmpl_var eventUrl>"><tmpl_var eventTitle></a><br/></li>
-            </tmpl_loop>
-		 </ul>            
-      </div>
-   </div>
-</tmpl_if></tmpl_loop></tmpl_loop>
-
-
diff --git a/docs/upgrades/templates-7.3.14/calendar_week.tmpl b/docs/upgrades/templates-7.3.14/calendar_week.tmpl
deleted file mode 100644
index 893008ea4..000000000
--- a/docs/upgrades/templates-7.3.14/calendar_week.tmpl
+++ /dev/null
@@ -1,63 +0,0 @@
-#CalendarWeek0000000001
-<tmpl_if admin>
-	<p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL">
-<tr>
-	<td style="text-align:right">
-		<a href="<tmpl_var urlDay>" class="tab">Day</a> <a href="<tmpl_var urlWeek>" class="tab active">Week</a> <a href="<tmpl_var urlMonth>" class="tab">Month</a> <a href="<tmpl_var urlSearch>" class="tab">Search</a>
-		<div class="controls">
-			<tmpl_if editor><a href="<tmpl_var urlAdd>">Add Event</a> &bull;</tmpl_if>
-			<a href="<tmpl_var urlPrint>">Print</a>
-		&bull;	<a href="<tmpl_var urlIcal>">iCal</a>
-			<!--&bull; <a href="#">Subscribe</a>-->
-		</div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="padding:3px 0px;">
-			<a href="<tmpl_var pagePrevUrl>" style="font-weight:bold;margin-right:8px;">&laquo; Previous Week
-			</a>&bull;
-			
-			<a href="#" onclick="return false;" style="margin-right:8px;margin-left:8px;" class="monthLink current"><tmpl_var startMonthAbbr> <tmpl_var startDayOfMonth> <tmpl_var startYear>&nbsp;&nbsp;-&nbsp;&nbsp;<tmpl_var endMonthAbbr> <tmpl_var endDayOfMonth> <tmpl_var endYear></a>&bull;
-			<a href="<tmpl_var pageNextUrl>" style="font-weight:bold;padding-left:8px">Next Week &raquo;</a>	 
-		</div>
-	</td>
-</tr>
-<tr>
-	<td>
-		<div  class="curMonth">
-			<tmpl_var startMonthName> <tmpl_var startDayOfMonth>, <tmpl_var startYear> to <tmpl_var endMonthName> <tmpl_var endDayOfMonth>, <tmpl_var endYear>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tmpl_loop days><tr>
-			<td class="heading">
-				<div style="padding:4px;"><tmpl_var dayName></div>
-			</td>
-			<td class="day<tmpl_if dayCurrent> curDay</tmpl_if>">			
-				<span class="border"><tmpl_var dayOfMonth></span>
-				<ul class="eventList"><tmpl_loop events>
-				<li><a href="<tmpl_var eventUrl>"><tmpl_var eventTitle></a></li>
-				</tmpl_loop></ul>
-				<br />
-			</td>
-		</tr></tmpl_loop>
-		</table>
-	</td>
-</tr>
-</table>
-
diff --git a/docs/upgrades/templates-7.3.16/style3.tmpl b/docs/upgrades/templates-7.3.16/style3.tmpl
deleted file mode 100755
index c3cb9a50b..000000000
--- a/docs/upgrades/templates-7.3.16/style3.tmpl
+++ /dev/null
@@ -1,53 +0,0 @@
-#stevestyle000000000003
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<link rel="icon" href="^Extras(favicon.png);" type="image/png" />
-        <link rel="SHORTCUT ICON" href="^Extras(favicon.ico);" />
-<link href="^/;style3/css03.css" rel="stylesheet" type="text/css" />
-	<tmpl_var head.tags>
-	<title>^c; - ^Page(title);</title>
-	</head>
-<body>
-^AdminBar();
-
-^AssetProxy(style3_coolmenu);
-
-<div id="main">
-	<div id="header">
-		<div id="headerTitle">
-			<div id="headerRight">
-				<div id="login">
-					^L("","","PBtmpl0000000000000092"); &middot; ^AdminToggle;
-				</div>
-				<div id="title">
-					<h1>^H(^c;);</h1>
-					<h2>^Page(title);</h2>
-				</div>
-				<a href="http://www.plainblack.com/webgui"><img src="^FileUrl(style3/wg.jpg);" style="border: 0px;" alt="webgui" /></a><br />
-			</div>
-		</div>
-	</div>
-	
-	<div id="mainBody">
-		<div id="contentArea">
-			<tmpl_var body.content>
-		</div>
-		<div id="topCorner">
-			^AssetProxy(style3/main_top.jpg);
-		</div>
-		<div id="bottomCorner"></div>
-
-		<div id="footer">
-			<div id="copyright">
-				&copy; ^D(%y); ^c;
-			</div>
-			<a href="http://www.plainblack.com"><img src="^FileUrl(style3/pb.jpg);" style="border: 0px;" alt="plain black" /></a><br />
-		</div>
-	</div>
-</div>
-
-
-</body>
-</html>
diff --git a/docs/upgrades/templates-7.3.2/CalendarDay.tmpl b/docs/upgrades/templates-7.3.2/CalendarDay.tmpl
deleted file mode 100755
index 206fcb324..000000000
--- a/docs/upgrades/templates-7.3.2/CalendarDay.tmpl
+++ /dev/null
@@ -1,267 +0,0 @@
-#CalendarDay00000000001
-<tmpl_if admin>
-	<p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-	<p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL">
-<tr>
-	<td style="text-align:right">
-		<a href="<tmpl_var urlDay>" class="tab active">Day</a>
-		<a href="<tmpl_var urlWeek>" class="tab">Week</a>
-		<a href="<tmpl_var urlMonth>" class="tab">Month</a>
-		<a href="<tmpl_var urlSearch>" class="tab">Search</a>
-		
-		<div class="controls">
-			<tmpl_if editor><a href="<tmpl_var urlAdd>">Add Event</a> &bull;</tmpl_if>
-			<a href="<tmpl_var urlPrint>">Print</a> <!--&bull; <a href="#">Subscribe</a>-->
-		</div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="padding:3px 0px;">
-			<a href="<tmpl_var pagePrevUrl>" style="font-weight:bold;margin-right:8px;">&laquo; Previous Day
-			</a>&bull;
-			
-			<span style="margin-right:8px;margin-left:8px;" class="monthLink current"><tmpl_var dayAbbr>, <tmpl_var monthAbbr> <tmpl_var dayOfMonth>. <tmpl_var year></span>&bull;
-			<a href="<tmpl_var pageNextUrl>" style="font-weight:bold;padding-left:8px">Next Day &raquo;</a>	 
-		</div>
-	</td>
-</tr>
-<tr>
-	<td>
-		<div  class="curMonth">
-			<tmpl_var dayName>, <tmpl_var monthName> <tmpl_var dayOfMonth>, <tmpl_var year>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tmpl_loop hours><tr>
-			<td class="heading">
-				<div style="padding:4px;"><tmpl_var hour12>:00<tmpl_var hourM></div>
-			</td>
-			<td class="day">							
-				<ul class="eventList">
-					<tmpl_loop events><li>
-					<a href="/<tmpl_var eventUrl>"><tmpl_var eventTitle></a>
-					</tmpl_loop></li>
-				</ul>				
-			</td>
-		</tr></tmpl_loop>
-		</table>		
-	</td>
-</tr>
-</table>
-~~~
-	<style type="text/css">
-		/* Edited with EditCSS */
-
-/**** Inline STYLE-tag style sheet ****/
-
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style:none;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#E9ECF3;
-			-moz-border-radius-topLeft:10px;
-			-moz-border-radius-topRight:10px;
-			color:#7588B5;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL .controls {
-			float:right;
-			vertical-align:bottom;
-		}
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .heading {
-			width:200px;
-			-moz-box-sizing:border-box;
-			background-color:#ABB7D1;
-			text-align:center;
-			font-weight:bold;
-			color:#374664;
-			font-size:9px;
-			letter-spacing:1px;
-			text-transform:uppercase;
-			text-align:right;
-			vertical-align:top;
-			-moz-border-radius-bottomRight:8px;
-			-moz-border-radius-topRight:8px;			
-		}
-		#mCAL .day {
-			background-color:#E9ECF3;			
-			width:400px;
-			position:relative;
-			vertical-align:top;		
-			-moz-border-radius-topLeft:8px;
-			-moz-border-radius-bottomLeft:8px;			
-			border:solid #CCD2E3 1px;
-		}
-		#mCAL .curDay {
-			background-color:#FFE4B3;
-			border-color:orange;
-		}
-		#mCAL .dayWrapper {			
-			height:100%;
-			width:100%;
-			position:relative;
-			z-index:0;
-			margin:0px;	
-			padding:0px 0px 2px 5px;;
-			-moz-box-sizing:border-box;
-		}
-		html > body #mCAL .dayWrapper {
-			height:auto;
-			min-height:100%;
-		}
-		#mCAL .dayNum {
-			width:100%;
-			text-align:right;
-			
-		}
-
-		#mCAL span.border {							
-			text-align:center;			
-			padding:5px;
-			font-weight:bold;
-			-moz-border-radius-bottomRight:5px;
-			-moz-border-radius-topLeft:5px;
-			color:black;			
-			border-right:solid #CCD2E3 1px;
-			border-bottom: solid #CCD2E3 1px;
-			background-color:#ABB7D1;
-			-moz-box-sizing:border-box;
-			top:5px;
-			position:relative;
-			
-		}
-		#mCAL .curDay span.border {
-			background-color:orange;
-			color:black;
-			border-color:orange;
-		}
-		#mCAL .event {
-			padding:3px;
-			padding-top:8px;
-			clear:left;
-			font-weight:bold;			
-		}
-		#mCAL .event a {
-			color:#4F4F4F;
-			text-decoration:none;
-			font-size:9px;
-		}
-		#mCAL .moreButton {
-			border-style:none;
-			z-index:5;
-			position:absolute;
-			bottom:0px;
-			width:100%;
-			height:9px;
-			background-color:#517AC8;	
-			font-size:5px;
-			text-align:center;
-		}
-		#mCAL .moreButton:hover {
-			background-color:orange;
-		}
-		#mCAL .empty {
-			border-style:none;
-			background-color:#CCD2E3;
-			-moz-border-radius:10px;
-			
-		}
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;			
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-		#mCAL .months .current {
-			color:#517AC8;
-		}
-		#mCAL .current {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:center;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-		
-		/* MORE STYLES */
-		#more1 {
-			position:absolute;
-			top:170px;
-			left:10px;			
-			
-		}
-		* html #more1 {
-			top:158px;
-			left:12px;
-
-		}
-		.moreDisplay {
-			border:solid orange 1px;
-			border-top:solid orange 2px;
-			font-family:arial;
-			font-size:10px;
-			width:300px;
-			padding:2px;
-			background-color:#FFD3A8;
-			z-index:10;			
-		}
-		ul.eventList {
-			margin:0px;
-			padding:0px;
-			margin-left:30px;
-			color:#526896;
-		}
-	</style>
diff --git a/docs/upgrades/templates-7.3.2/CalendarEvent.tmpl b/docs/upgrades/templates-7.3.2/CalendarEvent.tmpl
deleted file mode 100755
index 4a00e3547..000000000
--- a/docs/upgrades/templates-7.3.2/CalendarEvent.tmpl
+++ /dev/null
@@ -1,214 +0,0 @@
-#CalendarEvent000000001
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL" border="0">
-<tr>
-	<td style="text-align:right;border-bottom:solid white 1px;">
-		<a href="<tmpl_var urlDay>" class="tab">Day</a>
-		<a href="<tmpl_var urlWeek>" class="tab">Week</a>
-		<a href="<tmpl_var urlMonth>" class="tab">Month</a>
-		<a href="<tmpl_var urlSearch>" class="tab">Search</a>
-		
-		<div class="controls">
-			<a href="?func=edit">Edit</a> 
-			&bull; <a href="?func=delete">Delete</a> 
-			&bull; <a href="?print=1">Print</a>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="float: left;"><a href="<tmpl_var prevUrl>">&lt;&lt; Previous Event</a></div>
-		<div style="float: right;"><a href="<tmpl_var nextUrl>">Next Event &gt;&gt;</a></div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		Event Details
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Event Title</div>
-			</td>
-			<td class="day">	
-				<div class="eventWrapper">
-					<tmpl_var title>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Location</div>
-			</td>
-			<td class="day">	
-				<div class="eventWrapper">
-					<tmpl_var location>
-				</div>
-			</td>
-		</tr>
-		
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Description</div>
-			</td>
-			<td class="day">							
-				<div class="eventWrapper"><tmpl_var description></div>
-			</td>
-		</tr>
-
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Scheduled</div>
-			</td>
-			<td class="day">							
-				<div class="eventWrapper">
-					<tmpl_var startDateDayName>,
-					<tmpl_var startDateMonthName>
-					<tmpl_var startDateDayOfMonth>
-					<tmpl_var startDateHour>:<tmpl_var startDateMinute> <tmpl_var startDateM> &bull; <tmpl_var endDateDayName>, 
-					<tmpl_var endDateMonthName>
-					<tmpl_var endDateDayOfMonth>
-					<tmpl_var endDateHour>:<tmpl_var endDateMinute> <tmpl_var endDateM>
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td class="heading">
-				<div style="padding:4px;">Related Material</div>
-			</td>
-			<td class="day">								<div class="eventWrapper"><tmpl_loop relatedLinks>
-				<a href="<tmpl_var link.url>"><tmpl_var linkUrl></a><br />
-				</tmpl_loop></div>
-			</td>
-		</tr>
-	
-		</table>
-	</td>
-</tr>
-</table>
-~~~
-	<style type="text/css">
-		/* Edited with EditCSS */
-
-/**** Inline STYLE-tag style sheet ****/
-
-		body * {
-			margin:0px;
-		}	
-		#mCAL {
-			
-		}
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style:none;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#E9ECF3;
-			-moz-border-radius-topLeft:10px;
-			-moz-border-radius-topRight:10px;
-			color:#7588B5;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .heading {
-			width:200px;
-			-moz-box-sizing:border-box;
-			background-color:#ABB7D1;
-			text-align:center;
-			font-weight:bold;
-			color:#374664;
-			font-size:9px;
-			letter-spacing:1px;
-			text-transform:uppercase;
-			text-align:right;
-			vertical-align:top;
-			-moz-border-radius-bottomRight:8px;
-			-moz-border-radius-topRight:8px;			
-		}
-		#mCAL .day {
-			background-color:#E9ECF3;			
-			width:400px;
-			position:relative;
-			vertical-align:top;		
-			-moz-border-radius-topLeft:8px;
-			-moz-border-radius-bottomLeft:8px;			
-			border:solid #CCD2E3 1px;
-		}
-
-		
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;	
-			color:#3E4D75;
-			font-size:14px;
-			font-weight:bold;
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-		#mCAL .months .current {
-			color:#517AC8;
-		}
-		#mCAL .current {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:center;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-
-		#mCAL .searchField {
-			margin: 2px 10px;
-			border:solid #ABB7D1 1px;
-		}
-		#mCAL .searchBtn {
-			background-color: #ABB7D1;
-			border:solid #CCD2E3 1px;
-			color:white;
-			font-weight:bold;
-			cursor:pointer;
-		}
-		
-		#mCAL .eventWrapper {
-			margin:2px 10px;
-		}
-	</style>
diff --git a/docs/upgrades/templates-7.3.2/CalendarMonth.tmpl b/docs/upgrades/templates-7.3.2/CalendarMonth.tmpl
deleted file mode 100755
index 66c46eca2..000000000
--- a/docs/upgrades/templates-7.3.2/CalendarMonth.tmpl
+++ /dev/null
@@ -1,321 +0,0 @@
-#CalendarMonth000000001
-<tmpl_if admin>
-	<p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-
-<table cellspacing="0" cellpadding="0" width="630" id="mCAL">
-<tr>
-	<td style="text-align:right">
-		<a class="tab" href="<tmpl_var urlDay>">Day</a>
-		<a class="tab" href="<tmpl_var urlWeek>">Week</a>
-		<a class="tab" href="<tmpl_var urlMonth>">Month</a>
-		<a class="tab" href="<tmpl_var urlSearch>">Search</a>
-
-		<div class="controls"><tmpl_if editor><a href="<tmpl_var urlAdd>">Add Event</a></tmpl_if> &bull; <a href="<tmpl_var urlPrint>">Print</a> 
-			<!--&bull; <a href="#">Subscribe</a>-->
-		</div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="padding:3px 0px;">
-			<a href="<tmpl_var pagePrevUrl>" style="font-weight:bold;margin-right:8px;">&laquo; <tmpl_var pagePrevYear></a>&bull;
-			<tmpl_loop months>
-			<a style="margin-right:4px;" href="<tmpl_var monthUrl>" class="monthLink<tmpl_if monthCurrent> current</tmpl_if>"><tmpl_var monthAbbr></a>
-			</tmpl_loop>
-			&bull;
-			<a href="<tmpl_var pageNextUrl>" style="font-weight:bold;padding-left:8px"><tmpl_var pageNextYear> &raquo;</a>	 
-		</div>
-	</td>
-</tr>
-<tr>
-	<td>
-		<div  class="curMonth">
-			<tmpl_var monthName> <tmpl_var year>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-	
-	<!-- the calendar table -->
-	<table id="month" width="100%" cellspacing="2" cellpadding="0">	
-		<!-- day names -->
-		<tr><tmpl_loop dayNames>
-			<th><tmpl_var dayName></th>
-		</tmpl_loop></tr>
-		
-		<!-- the grid -->
-		<tmpl_loop weeks><tr>
-		<tmpl_loop days><td><div class="<tmpl_if dayMonth>active</tmpl_if><tmpl_if dayCurrent> current</tmpl_if>">
-			<tmpl_if dayMonth>
-			<a class="number" href="<tmpl_var dayUrl>"><tmpl_var dayMonth></a>
-
-			<tmpl_if events>
-			<ul class="events"><tmpl_loop events>
-				<li><a href="/<tmpl_var eventUrl>">
-					<tmpl_var eventMenuTitle>
-				</a></li>
-			</tmpl_loop></ul>			
-			<a href="#" onmouseover="DelayedRollover.showPopup('more<tmpl_var dayMonth>')" onmouseout="DelayedRollover.hidePopup('more<tmpl_var dayMonth>')" class="moreButton" onclick="return false;">
-				<img src="/extras/wobject/Calendar/images/more.gif" />
-			</a>
-			<div style="display: none" id="more<tmpl_var dayMonth>" class="moreDisplay" onmouseover="DelayedRollover.showPopup('more<tmpl_var dayMonth>')" onmouseout="DelayedRollover.hidePopup('more<tmpl_var dayMonth>')" >
-			<tmpl_loop events>
-			<a href="/<tmpl_var eventUrl>"><tmpl_var eventTitle></a><br/>
-			</tmpl_loop>
-			</div>
-			</tmpl_if> <!--/events-->
-			</tmpl_if> <!--/day-->
-		</div></td></tmpl_loop> <!--/days-->
-		</tr></tmpl_loop>
-	</table>
-</tr>
-</table>
-~~~
-<script type="text/javascript">
-// Delayed rollovers
-// From: http://www.pjhyett.com/articles/2006/07/05/timeout-your-mouseovers
-// Modified by: Doug Bell
-var DelayedRollover = {
-    timeout : new Array(),
-    showPopup : function(e){
-	element = document.getElementById(e);
-        clearTimeout(this.timeout[e]);
-        if(element.style.display == 'none'){
-            this.timeout[e] = setTimeout(function(){element.style.display="block"},10);
-        }
-    },
-    hidePopup : function(e){
-	element = document.getElementById(e);
-         if(element.style.display == 'none'){
-            clearTimeout(this.timeout[e]);
-        }else{
-            this.timeout[e] = setTimeout(function(){element.style.display="none"},10);
-        }
-    }    
-}
-</script>
-<style type="text/css">
-#mCAL { z-index: 0; }
-		#mCAL * {
-			margin:0px;			
-		}
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style:none;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#E9ECF3;
-			-moz-border-radius-topLeft:10px;
-			-moz-border-radius-topRight:10px;
-			color:#7588B5;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL .controls {
-			float:right;
-			vertical-align:bottom;
-		}
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;			
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-
-		#mCAL .months .current, #mCAL .months .monthLink:hover {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:center;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-
-
-
-/**** Month view ****/
-/* Table */
-#mCAL table#month
-{
-
-}
-
-#mCAL table#month *
-{
-	padding:		0px;
-	margin:			0px;
-}
-
-#mCAL table#month a
-{
-	text-decoration:	none;
-}
-
-#mCAL table#month th
-{
-	-moz-box-sizing:border-box;
-	width:			85px;
-	background-color:	#517AC8;
-	text-align:		center;
-	font-weight:		bold;
-	color:			white;	
-}
-
-#mCAL table#month div
-{
-	position:		relative;
-	width:			85px;
-	height:			85px;
-	margin:			0px;
-	background-color:	#E9ECF3;
-}
-
-#mCAL table#month ul 
-{	
-	overflow:		hidden;
-}
-
-#mCAL table#month .active 
-{
-	-moz-border-radius-topLeft:	8px;
-	-moz-border-radius-bottomLeft:	8px;
-	-moz-border-radius-bottomRight:	8px;
-	vertical-align:		top;		
-	background-color:	#CCD2E3;
-	border:			solid #CCD2E3 1px;
-}
-
-#mCAL table#month .current 
-{
-	background-color:	#FFE4B3;
-	border-color:		orange;
-}
-
-#mCAL table#month .number 
-{
-	-moz-border-radius-bottomLeft:5px;
-	display:		block;
-	position:		absolute;
-	top:			0px;
-	right:			0px;
-	height:			10px;
-	width:			10px;
-	background-color:	#516BA4;
-	color:			white;
-	text-align:		center;
-	vertical-align:		middle;
-	padding:		0px 3px 2px 2px;
-	font-weight:		bold;
-}
-
-#mCAL table#month .current .number
-{
-	background-color:	orange;
-	color:			black;
-}
-
-#mCAL table#month .events 
-{
-	padding:		3px;
-	padding-top:		8px;
-	font-weight:		bold;			
-}
-
-#mCAL table#month .events a 
-{
-	color:			#4F4F4F;
-	text-decoration:	none;
-	font-size:		9px;
-}
-
-#mCAL table#month .moreButton 
-{
-	border-style:		none;
-	position:		absolute;
-	bottom:			0px;
-	width:			100%;
-	height:			9px;
-	background-color:	#517AC8;	
-	font-size:		5px;
-	text-align:		center;
-	-moz-border-radius-bottomLeft:	8px;
-	-moz-border-radius-bottomRight:	8px;
-}
-
-#mCAL table#month .moreButton img
-{
-	border:			none;
-}
-
-#mCAL table#month .moreButton:hover
-{
-	background-color:	orange;
-}
-
-
-/* MORE STYLES */
-
-#mCAL table#month .moreDisplay 
-{
-	position: 		absolute;
-	left: 			0px;
-	top: 			85px;
-	border:			solid orange 1px;
-	border-top:		solid orange 2px;
-	font-family:		arial;
-	font-size:		10px;
-	width:			300px;
-	height: 		auto;
-	padding:		2px;
-	background-color:	#FFD3A8;
-	z-index: 		100;
-}
-* html body table#month td { position: relative; z-index: 1; }
-</style>
diff --git a/docs/upgrades/templates-7.3.2/CalendarWeek.tmpl b/docs/upgrades/templates-7.3.2/CalendarWeek.tmpl
deleted file mode 100755
index 88e77a109..000000000
--- a/docs/upgrades/templates-7.3.2/CalendarWeek.tmpl
+++ /dev/null
@@ -1,265 +0,0 @@
-#CalendarWeek0000000001
-<tmpl_if admin>
-	<p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL">
-<tr>
-	<td style="text-align:right">
-		<a href="<tmpl_var urlDay>" class="tab">Day</a> <a href="<tmpl_var urlWeek>" class="tab active">Week</a> <a href="<tmpl_var urlMonth>" class="tab">Month</a> <a href="<tmpl_var urlSearch>" class="tab">Search</a>
-		<div class="controls">
-			<tmpl_if editor><a href="<tmpl_var urlAdd>">Add Event</a> &bull;</tmpl_if>
-			<a href="<tmpl_var urlPrint>">Print</a> 
-			<!--&bull; <a href="#">Subscribe</a>-->
-		</div>
-	</td>
-</tr>
-<tr>
-	<td class="months">
-		<div style="padding:3px 0px;">
-			<a href="<tmpl_var pagePrevUrl>" style="font-weight:bold;margin-right:8px;">&laquo; Previous Week
-			</a>&bull;
-			
-			<a href="#" onclick="return false;" style="margin-right:8px;margin-left:8px;" class="monthLink current"><tmpl_var startMonthAbbr> <tmpl_var startDayOfMonth> <tmpl_var startYear>&nbsp;&nbsp;-&nbsp;&nbsp;<tmpl_var endMonthAbbr> <tmpl_var endDayOfMonth> <tmpl_var endYear></a>&bull;
-			<a href="<tmpl_var pageNextUrl>" style="font-weight:bold;padding-left:8px">Next Week &raquo;</a>	 
-		</div>
-	</td>
-</tr>
-<tr>
-	<td>
-		<div  class="curMonth">
-			<tmpl_var startMonthName> <tmpl_var startDayOfMonth>, <tmpl_var startYear> to <tmpl_var endMonthName> <tmpl_var endDayOfMonth>, <tmpl_var endYear>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td style="width:100%">
-		<table width="100%" cellspacing="2" cellpadding="0">
-		<tmpl_loop days><tr>
-			<td class="heading">
-				<div style="padding:4px;"><tmpl_var dayName></div>
-			</td>
-			<td class="day<tmpl_if dayCurrent> curDay</tmpl_if>">			
-				<span class="border"><tmpl_var dayOfMonth></span>
-				<ul class="eventList"><tmpl_loop events>
-				<li><a href="<tmpl_var eventUrl>"><tmpl_var eventTitle></a></li>
-				</tmpl_loop></ul>
-				<br />
-			</td>
-		</tr></tmpl_loop>
-		</table>
-	</td>
-</tr>
-</table>
-~~~
-<style type="text/css">
-		#mCAL * {
-			/*margin:0px;*/
-		}
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style:none;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#E9ECF3;
-			-moz-border-radius-topLeft:10px;
-			-moz-border-radius-topRight:10px;
-			color:#7588B5;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL .controls {
-			float:right;
-			vertical-align:bottom;
-		}
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .heading {
-			width:200px;
-			-moz-box-sizing:border-box;
-			background-color:#ABB7D1;
-			text-align:center;
-			font-weight:bold;
-			color:#374664;
-			font-size:9px;
-			letter-spacing:1px;
-			text-transform:uppercase;
-			text-align:right;
-			vertical-align:top;
-			-moz-border-radius-bottomRight:8px;
-			-moz-border-radius-topRight:8px;			
-		}
-		#mCAL .day {
-			background-color:#E9ECF3;			
-			width:400px;
-			position:relative;
-			vertical-align:top;		
-			-moz-border-radius-topLeft:8px;
-			-moz-border-radius-bottomLeft:8px;			
-			border:solid #CCD2E3 1px;
-		}
-		#mCAL .curDay {
-			background-color:#FFE4B3;
-			border-color:orange;
-		}
-		#mCAL .dayWrapper {			
-			height:100%;
-			width:100%;
-			position:relative;
-			z-index:0;
-			margin:0px;	
-			padding:0px 0px 2px 5px;;
-			-moz-box-sizing:border-box;
-		}
-		html > body #mCAL .dayWrapper {
-			height:auto;
-			min-height:100%;
-		}
-		#mCAL .dayNum {
-			width:100%;
-			text-align:right;
-			
-		}
-
-		#mCAL span.border {							
-			text-align:center;			
-			padding:5px;
-			font-weight:bold;
-			-moz-border-radius-bottomRight:5px;
-			-moz-border-radius-topLeft:5px;
-			color:black;			
-			border-right:solid #CCD2E3 1px;
-			border-bottom: solid #CCD2E3 1px;
-			background-color:#ABB7D1;
-			-moz-box-sizing:border-box;
-			top:5px;
-			position:relative;
-			
-		}
-		#mCAL .curDay span.border {
-			background-color:orange;
-			color:black;
-			border-color:orange;
-		}
-		#mCAL .event {
-			padding:3px;
-			padding-top:8px;
-			clear:left;
-			font-weight:bold;			
-		}
-		#mCAL .event a {
-			color:#4F4F4F;
-			text-decoration:none;
-			font-size:9px;
-		}
-		#mCAL .moreButton {
-			border-style:none;
-			z-index:5;
-			position:absolute;
-			bottom:0px;
-			width:100%;
-			height:9px;
-			background-color:#517AC8;	
-			font-size:5px;
-			text-align:center;
-		}
-		#mCAL .moreButton:hover {
-			background-color:orange;
-		}
-		#mCAL .empty {
-			border-style:none;
-			background-color:#CCD2E3;
-			-moz-border-radius:10px;
-			
-		}
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;			
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-		#mCAL .months .current {
-			color:#517AC8;
-		}
-		#mCAL .current {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:center;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-		
-		/* MORE STYLES */
-		#more1 {
-			position:absolute;
-			top:170px;
-			left:10px;			
-			
-		}
-		* html #more1 {
-			top:158px;
-			left:12px;
-
-		}
-		.moreDisplay {
-			border:solid orange 1px;
-			border-top:solid orange 2px;
-			font-family:arial;
-			font-size:10px;
-			width:300px;
-			padding:2px;
-			background-color:#FFD3A8;
-			z-index:10;			
-		}
-		ul.eventList {
-			margin:0px;
-			padding:0px;
-			margin-left:50px;
-			color:#526896;
-		}
-
-
-</style>
diff --git a/docs/upgrades/templates-7.3.2/default-calendar-print-day.tmpl b/docs/upgrades/templates-7.3.2/default-calendar-print-day.tmpl
deleted file mode 100755
index c1b34fd0d..000000000
--- a/docs/upgrades/templates-7.3.2/default-calendar-print-day.tmpl
+++ /dev/null
@@ -1,65 +0,0 @@
-#CalendarPrintDay000001
-#create
-#namespace:Calendar/Print/Day
-#url:default-calendar-print-day
-#title:Default Calendar Print Day
-#menuTitle:Default Calendar Print Day
-<div class="calHeader">
-	<tmpl_var monthName> <tmpl_var dayOfMonth> <tmpl_var year>
-</div>
-
-<table cellspacing="0" cellpadding="4" id="printableCal" border="0">
-<tmpl_loop hours><tmpl_if events>
-<tr>
-	<td class="label"><tmpl_var hour24>:00</td>
-	<td>
-		<ul>
-			<tmpl_loop events><li><tmpl_var eventTitle></li>
-			</tmpl_loop>
-		</ul>
-	</td>
-</tr>
-</tmpl_if></tmpl_loop>
-</table>
-
-<div class="calFooter">
-	&copy; Plain Black 2006
-</div>
-~~~
-	<style type="text/css">
-	.calHeader {
-		font-size:22px;
-		font-weight:bold;
-		text-align:right;		
-		border-bottom:double #666 3px;
-		width:65%;
-		font-family:arial;
-	}	
-	#printableCal {
-		font-family:arial;
-		font-size:13px;
-		width:65%;
-		border:solid #aaa 1px;
-		border-top-style:none;
-	}
-	#printableCal .label {
-		font-weight:bold;
-		font-size:13px;
-		vertical-align:top;
-		width:15%;
-	}
-	#printableCal ul {
-		margin:0px;
-		padding:0px;
-		padding-left:16px;
-	}
-	#printableCal .alt {
-		background-color:#eee;
-	}
-	.calFooter {
-		width:65%;
-		text-align:center;
-		font-size:10px;
-		font-family:arial;
-	}
-	</style>
diff --git a/docs/upgrades/templates-7.3.2/default-calendar-print-event.tmpl b/docs/upgrades/templates-7.3.2/default-calendar-print-event.tmpl
deleted file mode 100755
index a7c125124..000000000
--- a/docs/upgrades/templates-7.3.2/default-calendar-print-event.tmpl
+++ /dev/null
@@ -1,97 +0,0 @@
-#CalendarPrintEvent0001
-#create
-#namespace:Calendar/Print/Event
-#url:default-calendar-print-event
-#title:Default Calendar Print Event
-#menuTitle:Default Calendar Print Event
-<div class="calHeader">
-	<tmpl_var title>
-</div>		
-
-<table id="printableCal" width="100%" cellspacing="2" cellpadding="0">
-<tr>
-	<td class="heading">
-		<div style="padding:4px;">Location</div>
-	</td>
-	<td class="day">	
-		<div class="eventWrapper">
-			<tmpl_var location>
-		</div>
-	</td>
-</tr>
-
-<tr>
-	<td class="heading">
-		<div style="padding:4px;">Description</div>
-	</td>
-	<td class="day">							
-		<div class="eventWrapper"><tmpl_var description></div>
-	</td>
-</tr>
-
-<tr>
-	<td class="heading">
-		<div style="padding:4px;">Scheduled</div>
-	</td>
-	<td class="day">							
-		<div class="eventWrapper">
-			<tmpl_var startDateDayName>,
-			<tmpl_var startDateMonthName>
-			<tmpl_var startDateDayOfMonth>
-			<tmpl_var startDateHour>:<tmpl_var startDateMinute> <tmpl_var startDateM> &bull; <tmpl_var endDateDayName>, 
-			<tmpl_var endDateMonthName>
-			<tmpl_var endDateDayOfMonth>
-			<tmpl_var endDateHour>:<tmpl_var endDateMinute> <tmpl_var endDateM>
-		</div>
-	</td>
-</tr>
-
-<tr>
-	<td class="heading">
-		<div style="padding:4px;">Related Material</div>
-	</td>
-	<td class="day">								<div class="eventWrapper"><tmpl_loop relatedLinks>
-		<a href="<tmpl_var link.url>"><tmpl_var linkUrl></a><br />
-		</tmpl_loop></div>
-	</td>
-</tr>
-
-</table>
-~~~
-	<style type="text/css">
-	.calHeader {
-		font-size:22px;
-		font-weight:bold;
-		text-align:right;		
-		border-bottom:double #666 3px;
-		width:65%;
-		font-family:arial;
-	}	
-	#printableCal {
-		font-family:arial;
-		font-size:13px;
-		width:65%;
-		border:solid #aaa 1px;
-		border-top-style:none;
-	}
-	#printableCal .label {
-		font-weight:bold;
-		font-size:13px;
-		vertical-align:top;
-		width:15%;
-	}
-	#printableCal ul {
-		margin:0px;
-		padding:0px;
-		padding-left:16px;
-	}
-	#printableCal .alt {
-		background-color:#eee;
-	}
-	.calFooter {
-		width:65%;
-		text-align:center;
-		font-size:10px;
-		font-family:arial;
-	}
-	</style>
diff --git a/docs/upgrades/templates-7.3.2/default-calendar-print-month.tmpl b/docs/upgrades/templates-7.3.2/default-calendar-print-month.tmpl
deleted file mode 100755
index 736795675..000000000
--- a/docs/upgrades/templates-7.3.2/default-calendar-print-month.tmpl
+++ /dev/null
@@ -1,65 +0,0 @@
-#CalendarPrintMonth0001
-#create
-#namespace:Calendar/Print/Month
-#url:default-calendar-print-month
-#title:Default Calendar Print Month
-#menuTitle:Default Calendar Print Month
-<div class="calHeader">
-	<tmpl_var monthName> <tmpl_var year>
-</div>
-
-<table cellspacing="0" cellpadding="4" id="printableCal" border="0">
-<tmpl_loop weeks><tmpl_loop days><tmpl_if events>
-<tr>
-	<td class="label"><tmpl_var monthName> <tmpl_var dayMonth></td>
-	<td>
-		<ul>
-			<tmpl_loop events><li><tmpl_var eventTitle></li>
-			</tmpl_loop>
-		</ul>
-	</td>
-</tr>
-</tmpl_if></tmpl_loop></tmpl_loop>
-</table>
-
-<div class="calFooter">
-	&copy; Plain Black 2006
-</div>
-~~~
-	<style type="text/css">
-	.calHeader {
-		font-size:22px;
-		font-weight:bold;
-		text-align:right;		
-		border-bottom:double #666 3px;
-		width:65%;
-		font-family:arial;
-	}	
-	#printableCal {
-		font-family:arial;
-		font-size:13px;
-		width:65%;
-		border:solid #aaa 1px;
-		border-top-style:none;
-	}
-	#printableCal .label {
-		font-weight:bold;
-		font-size:13px;
-		vertical-align:top;
-		width:15%;
-	}
-	#printableCal ul {
-		margin:0px;
-		padding:0px;
-		padding-left:16px;
-	}
-	#printableCal .alt {
-		background-color:#eee;
-	}
-	.calFooter {
-		width:65%;
-		text-align:center;
-		font-size:10px;
-		font-family:arial;
-	}
-	</style>
diff --git a/docs/upgrades/templates-7.3.2/default-calendar-print-week.tmpl b/docs/upgrades/templates-7.3.2/default-calendar-print-week.tmpl
deleted file mode 100755
index c2286edc6..000000000
--- a/docs/upgrades/templates-7.3.2/default-calendar-print-week.tmpl
+++ /dev/null
@@ -1,65 +0,0 @@
-#CalendarPrintWeek00001
-#create
-#namespace:Calendar/Print/Week
-#url:default-calendar-print-week
-#title:Default Calendar Print Week
-#menuTitle:Default Calendar Print Week
-<div class="calHeader">
-	<tmpl_var startMonthName> <tmpl_var startDayOfMonth> <tmpl_var startYear>&nbsp;&nbsp;-&nbsp;&nbsp;<tmpl_var endMonthName> <tmpl_var endDayOfMonth> <tmpl_var endYear>
-</div>
-
-<table cellspacing="0" cellpadding="4" id="printableCal" border="0">
-<tmpl_loop days><tmpl_if events>
-<tr>
-	<td class="label"><tmpl_var monthName> <tmpl_var dayOfMonth></td>
-	<td>
-		<ul>
-			<tmpl_loop events><li><tmpl_var eventTitle></li>
-			</tmpl_loop>
-		</ul>
-	</td>
-</tr>
-</tmpl_if></tmpl_loop>
-</table>
-
-<div class="calFooter">
-	&copy; Plain Black 2006
-</div>
-~~~
-	<style type="text/css">
-	.calHeader {
-		font-size:22px;
-		font-weight:bold;
-		text-align:right;		
-		border-bottom:double #666 3px;
-		width:65%;
-		font-family:arial;
-	}	
-	#printableCal {
-		font-family:arial;
-		font-size:13px;
-		width:65%;
-		border:solid #aaa 1px;
-		border-top-style:none;
-	}
-	#printableCal .label {
-		font-weight:bold;
-		font-size:13px;
-		vertical-align:top;
-		width:15%;
-	}
-	#printableCal ul {
-		margin:0px;
-		padding:0px;
-		padding-left:16px;
-	}
-	#printableCal .alt {
-		background-color:#eee;
-	}
-	.calFooter {
-		width:65%;
-		text-align:center;
-		font-size:10px;
-		font-family:arial;
-	}
-	</style>
diff --git a/docs/upgrades/templates-7.3.2/default-sqlform-search.tmpl b/docs/upgrades/templates-7.3.2/default-sqlform-search.tmpl
deleted file mode 100644
index f4c512a07..000000000
--- a/docs/upgrades/templates-7.3.2/default-sqlform-search.tmpl
+++ /dev/null
@@ -1,83 +0,0 @@
-#SQLFormSearchTmpl00001
-
-<a name="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<p><tmpl_var controls></p>
-</tmpl_if>
-
-<div class="SQLForm-contentBox">
-
-<tmpl_if displayTitle>
-	<h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_var managementLinks>
-
-<h2>Search records</h2>
-<a href="<tmpl_var superSearch.url>"><tmpl_var superSearch.label></a><br />
-
-<tmpl_if errorOccurred>
-Some error(s) occurred:
-<ul>
-	<tmpl_loop errorLoop>
-	<li><tmpl_var error.message></li>
-	</tmpl_loop>
-</ul>
-</tmpl_if>
-
-<tmpl_var searchForm>
-
-<tmpl_if showFieldsDefined>
-<tmpl_var searchResults.header>
-<tmpl_var searchResults.actionButtons>
-<table border="0">
-	<tr>
-		<th></th>
-		<tmpl_if showMetaData>
-		<th>Last update</th>
-		<th>Last update by</th>
-		</tmpl_if>
-	<tmpl_loop headerLoop>
-		<th <tmpl_if
-header.sort.onThis>color="red"</tmpl_if>>
-			<a href="<tmpl_var header.sort.url>">
-			<tmpl_var header.title> 
-			<tmpl_if header.sort.onThis><tmpl_if header.sort.ascending>(asc)<tmpl_else>(desc)</tmpl_if></tmpl_if></a></th>
-	</tmpl_loop>
-	</tr>
-	<tmpl_loop searchResults.recordLoop>
-	<tr>
-		<td><tmpl_var record.controls></td>
-		<tmpl_if showMetaData>
-		<td><tmpl_var record.updateDate></td>
-		<td><tmpl_var record.updatedBy></td>
-		</tmpl_if>
-		<tmpl_loop record.valueLoop>
-		<td>
-		<tmpl_if record.value.isFile>
-			<tmpl_if record.value>
-				<a href="<tmpl_var record.value.downloadUrl>">
-				<tmpl_if record.value.isImage>
-					<img width="100" src="<tmpl_var record.value.thumbnailUrl>" alt="<tmpl_var record.value.downloadUrl>" />
-				<tmpl_else>
-					Click here for file
-				</tmpl_if>
-				</a>
-			</tmpl_if>
-		<tmpl_else>
-			<tmpl_var record.value>
-		</tmpl_if>
-		</td>
-		</tmpl_loop>
-	</tr>
-	</tmpl_loop>
-</table>
-<tmpl_var searchResults.actionButtons>
-<tmpl_var searchResults.footer>
-<tmpl_else>
-No fields are defined to be shown in the search results.
-</tmpl_if>
-
-</div>
-
diff --git a/docs/upgrades/templates-7.3.4/calendar_day.tmpl b/docs/upgrades/templates-7.3.4/calendar_day.tmpl
deleted file mode 100644
index 821d64049..000000000
--- a/docs/upgrades/templates-7.3.4/calendar_day.tmpl
+++ /dev/null
@@ -1,268 +0,0 @@
-#CalendarDay00000000001
-<tmpl_if admin>
-    <p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-    <h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-    <p><tmpl_var description></p>
-</tmpl_if>
-
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL">
-<tr>
-    <td style="text-align:right">
-        <a href="<tmpl_var urlDay>" class="tab active">Day</a>
-        <a href="<tmpl_var urlWeek>" class="tab">Week</a>
-        <a href="<tmpl_var urlMonth>" class="tab">Month</a>
-        <a href="<tmpl_var urlSearch>" class="tab">Search</a>
-        
-        <div class="controls">
-            <tmpl_if editor><a href="<tmpl_var urlAdd>">Add Event</a> &bull;</tmpl_if>
-            <a href="<tmpl_var urlPrint>">Print</a> <!--&bull; <a href="#">Subscribe</a>-->
-        </div>
-    </td>
-</tr>
-<tr>
-    <td class="months">
-        <div style="padding:3px 0px;">
-            <a href="<tmpl_var pagePrevUrl>" style="font-weight:bold;margin-right:8px;">&laquo; Previous Day
-            </a>&bull;
-            
-            <span style="margin-right:8px;margin-left:8px;" class="monthLink current"><tmpl_var dayAbbr>, <tmpl_var monthAbbr> <tmpl_var dayOfMonth>. <tmpl_var year></span>&bull;
-                <a href="<tmpl_var pageNextUrl>" style="font-weight:bold;padding-left:8px">Next Day &raquo;</a> 
-        </div>
-    </td>
-</tr>
-<tr>
-    <td>
-        <div  class="curMonth">
-            <tmpl_var dayName>, <tmpl_var monthName> <tmpl_var dayOfMonth>, <tmpl_var year>
-        </div>
-    </td>
-</tr>
-<tr>
-    <td style="width:100%">
-        <table width="100%" cellspacing="2" cellpadding="0">
-        <tmpl_loop hours><tr>
-            <td class="heading">
-                <div style="padding:4px;"><tmpl_var hour12>:00<tmpl_var hourM></div>
-            </td>
-                                        <td class="day">
-                <ul class="eventList">
-                    <tmpl_loop events><li>
-                    <a href="<tmpl_var eventUrl>"><tmpl_var eventTitle></a>
-                    </tmpl_loop></li>
-                                </ul>
-            </td>
-        </tr></tmpl_loop>
-                </table>
-    </td>
-</tr>
-</table>
-~~~
-    <style type="text/css">
-        /* Edited with EditCSS */
-
-/**** Inline STYLE-tag style sheet ****/
-
-        #mCAL td {
-            font-size:10px;
-            font-family:arial;
-        }
-        #mCAL .tab {
-
-            border-bottom-style:none;
-            font-weight:bold;
-            padding: 2px 15px 0px 15px;
-            text-align;center;
-            background-color:#E9ECF3;
-            -moz-border-radius-topLeft:10px;
-            -moz-border-radius-topRight:10px;
-            color:#7588B5;
-            text-decoration:none;
-            font-size:10pt;
-            display:block;
-            float:left;
-            margin-right:5px;
-        }
-        #mCAL .tab:hover {
-            color:black;
-            }
-        #mCAL .active {
-            background-color:#DFE3EE;
-            color:#404F77;
-            border-bottom:solid #DFE3EE 1px;
-            }
-        #mCAL .controls {
-            float:right;
-            vertical-align:bottom;
-        }
-        #mCAL a {
-            font-size:11px;
-            color:#517AC8;
-            }
-        #mCAL .heading {
-            width:200px;
-            -moz-box-sizing:border-box;
-            background-color:#ABB7D1;
-            text-align:center;
-            font-weight:bold;
-            color:#374664;
-            font-size:9px;
-            letter-spacing:1px;
-            text-transform:uppercase;
-            text-align:right;
-            vertical-align:top;
-            -moz-border-radius-bottomRight:8px;
-                        -moz-border-radius-topRight:8px;
-        }
-        #mCAL .day {
-                        background-color:#E9ECF3;
-            width:400px;
-            position:relative;
-                    vertical-align:top;
-            -moz-border-radius-topLeft:8px;
-                        -moz-border-radius-bottomLeft:8px;
-            border:solid #CCD2E3 1px;
-        }
-        #mCAL .curDay {
-            background-color:#FFE4B3;
-            border-color:orange;
-        }
-                    #mCAL .dayWrapper {
-            height:100%;
-            width:100%;
-            position:relative;
-            z-index:0;
-                margin:0px;
-            padding:0px 0px 2px 5px;;
-            -moz-box-sizing:border-box;
-        }
-        html > body #mCAL .dayWrapper {
-            height:auto;
-            min-height:100%;
-        }
-        #mCAL .dayNum {
-            width:100%;
-            text-align:right;
-            
-        }
-
-                                    #mCAL span.border {
-                        text-align:center;
-            padding:5px;
-            font-weight:bold;
-            -moz-border-radius-bottomRight:5px;
-            -moz-border-radius-topLeft:5px;
-                        color:black;
-            border-right:solid #CCD2E3 1px;
-            border-bottom: solid #CCD2E3 1px;
-            background-color:#ABB7D1;
-            -moz-box-sizing:border-box;
-            top:5px;
-            position:relative;
-            
-        }
-        #mCAL .curDay span.border {
-            background-color:orange;
-            color:black;
-            border-color:orange;
-        }
-        #mCAL .event {
-            padding:3px;
-            padding-top:8px;
-            clear:left;
-                        font-weight:bold;
-        }
-        #mCAL .event a {
-            color:#4F4F4F;
-            text-decoration:none;
-            font-size:9px;
-        }
-        #mCAL .moreButton {
-            border-style:none;
-            z-index:5;
-            position:absolute;
-            bottom:0px;
-            width:100%;
-            height:9px;
-                background-color:#517AC8;
-            font-size:5px;
-            text-align:center;
-        }
-        #mCAL .moreButton:hover {
-            background-color:orange;
-        }
-        #mCAL .empty {
-            border-style:none;
-            background-color:#CCD2E3;
-            -moz-border-radius:10px;
-            
-        }
-        #mCAL .months {
-            text-align:center;
-                        background-color:#DFE3EE;
-        }
-        #mCAL .months a {
-            color:#517AC8;
-            text-decoration:none;
-        }
-        #mCAL .months .monthLink {
-                        text-decoration:none;
-            padding-left:5px;
-            padding-right:5px;
-            color:#AAB8D5;
-            font-size:12px;
-            font-weight:bold;
-            }
-        #mCAL .months .current {
-            color:#517AC8;
-        }
-        #mCAL .current {
-            font-weight:bold;
-            color:#517AC8;
-                        background-color:#fff;
-            -moz-border-radius:5px;
-        }
-        #mCAL .curMonth {
-            text-align:center;
-            margin: 2px 0px;
-            background-color:#517AC8;
-            color:white;
-            font-size:14px;
-            font-weight:bold;
-        }
-        
-        /* MORE STYLES */
-        #more1 {
-            position:absolute;
-            top:170px;
-                        left:10px;
-            
-        }
-        * html #more1 {
-            top:158px;
-            left:12px;
-
-        }
-        .moreDisplay {
-            border:solid orange 1px;
-            border-top:solid orange 2px;
-            font-family:arial;
-            font-size:10px;
-            width:300px;
-            padding:2px;
-            background-color:#FFD3A8;
-                        z-index:10;
-        }
-        ul.eventList {
-            margin:0px;
-            padding:0px;
-            margin-left:30px;
-            color:#526896;
-        }
-    </style>
-
diff --git a/docs/upgrades/templates-7.3.4/calendar_month.tmpl b/docs/upgrades/templates-7.3.4/calendar_month.tmpl
deleted file mode 100644
index f0c5056dd..000000000
--- a/docs/upgrades/templates-7.3.4/calendar_month.tmpl
+++ /dev/null
@@ -1,319 +0,0 @@
-#CalendarMonth000000001
-<tmpl_if admin>
-    <p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-    <h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-    <tmpl_var description>
-</tmpl_if>
-
-
-<table cellspacing="0" cellpadding="0" width="630" id="mCAL">
-<tr>
-    <td style="text-align:right">
-        <a class="tab" href="<tmpl_var urlDay>">Day</a>
-        <a class="tab" href="<tmpl_var urlWeek>">Week</a>
-        <a class="tab" href="<tmpl_var urlMonth>">Month</a>
-        <a class="tab" href="<tmpl_var urlSearch>">Search</a>
-
-        <div class="controls"><tmpl_if editor><a href="<tmpl_var urlAdd>">Add Event</a></tmpl_if> &bull; <a href="<tmpl_var urlPrint>">Print</a> 
-            <!--&bull; <a href="#">Subscribe</a>-->
-        </div>
-    </td>
-</tr>
-<tr>
-    <td class="months">
-        <div style="padding:3px 0px;">
-            <a href="<tmpl_var pagePrevUrl>" style="font-weight:bold;margin-right:8px;">&laquo; <tmpl_var pagePrevYear></a>&bull;
-            <tmpl_loop months>
-            <a style="margin-right:4px;" href="<tmpl_var monthUrl>" class="monthLink<tmpl_if monthCurrent> current</tmpl_if>"><tmpl_var monthAbbr></a>
-            </tmpl_loop>
-            &bull;
-                <a href="<tmpl_var pageNextUrl>" style="font-weight:bold;padding-left:8px"><tmpl_var pageNextYear> &raquo;</a> 
-        </div>
-    </td>
-</tr>
-<tr>
-    <td>
-        <div  class="curMonth">
-            <tmpl_var monthName> <tmpl_var year>
-        </div>
-    </td>
-</tr>
-<tr>
-    <td style="width:100%">
-    
-    <!-- the calendar table -->
-        <table id="month" width="100%" cellspacing="2" cellpadding="0">
-        <!-- day names -->
-        <tr><tmpl_loop dayNames>
-            <th><tmpl_var dayName></th>
-        </tmpl_loop></tr>
-        
-        <!-- the grid -->
-        <tmpl_loop weeks><tr>
-        <tmpl_loop days><td><div class="<tmpl_if dayMonth>active</tmpl_if><tmpl_if dayCurrent> current</tmpl_if>">
-            <tmpl_if dayMonth>
-            <a class="number" href="<tmpl_var dayUrl>"><tmpl_var dayMonth></a>
-
-            <tmpl_if events>
-            <ul class="events"><tmpl_loop events>
-                <li><a href="<tmpl_var eventUrl>">
-                    <tmpl_var eventMenuTitle>
-                </a></li>
-                        </tmpl_loop></ul>
-            <a href="#" onmouseover="DelayedRollover.showPopup('more<tmpl_var dayMonth>')" onmouseout="DelayedRollover.hidePopup('more<tmpl_var dayMonth>')" class="moreButton" onclick="return false;">
-                <img src="/extras/wobject/Calendar/images/more.gif" />
-            </a>
-            <div style="display: none" id="more<tmpl_var dayMonth>" class="moreDisplay" onmouseover="DelayedRollover.showPopup('more<tmpl_var dayMonth>')" onmouseout="DelayedRollover.hidePopup('more<tmpl_var dayMonth>')" >
-            <tmpl_loop events>
-            <a href="/<tmpl_var eventUrl>"><tmpl_var eventTitle></a><br/>
-            </tmpl_loop>
-            </div>
-            </tmpl_if> <!--/events-->
-            </tmpl_if> <!--/day-->
-        </div></td></tmpl_loop> <!--/days-->
-        </tr></tmpl_loop>
-    </table>
-</tr>
-</table>
-~~~
-<script type="text/javascript">
-// Delayed rollovers
-// From: http://www.pjhyett.com/articles/2006/07/05/timeout-your-mouseovers
-// Modified by: Doug Bell
-var DelayedRollover = {
-    timeout : new Array(),
-    showPopup : function(e){
-    element = document.getElementById(e);
-        clearTimeout(this.timeout[e]);
-        if(element.style.display == 'none'){
-            this.timeout[e] = setTimeout(function(){element.style.display="block"},10);
-        }
-    },
-    hidePopup : function(e){
-    element = document.getElementById(e);
-         if(element.style.display == 'none'){
-            clearTimeout(this.timeout[e]);
-        }else{
-            this.timeout[e] = setTimeout(function(){element.style.display="none"},10);
-        }
-    }    
-}
-</script>
-<style type="text/css">
-    #mCAL * {
-        margin:0px;
-    }
-    #mCAL td {
-        font-size:10px;
-        font-family:arial;
-    }
-    #mCAL .tab {
-        border-bottom-style:none;
-        font-weight:bold;
-        padding: 2px 15px 0px 15px;
-        text-align;center;
-        background-color:#E9ECF3;
-        -moz-border-radius-topLeft:10px;
-        -moz-border-radius-topRight:10px;
-        color:#7588B5;
-        text-decoration:none;
-        font-size:10pt;
-        display:block;
-        float:left;
-        margin-right:5px;
-    }
-        #mCAL .tab:hover {
-            color:black;
-            }
-        #mCAL .active {
-            background-color:#DFE3EE;
-            color:#404F77;
-            border-bottom:solid #DFE3EE 1px;
-            }
-        #mCAL .controls {
-            float:right;
-            vertical-align:bottom;
-        }
-        #mCAL a {
-            font-size:11px;
-            color:#517AC8;
-            }
-        #mCAL .months {
-            text-align:center;
-            background-color:#DFE3EE;
-        }
-        #mCAL .months a {
-            color:#517AC8;
-            text-decoration:none;
-        }
-        #mCAL .months .monthLink {
-            text-decoration:none;
-            padding-left:5px;
-            padding-right:5px;
-            color:#AAB8D5;
-            font-size:12px;
-            font-weight:bold;
-            }
-
-        #mCAL .months .current, #mCAL .months .monthLink:hover {
-            font-weight:bold;
-            color:#517AC8;
-            background-color:#fff;
-            -moz-border-radius:5px;
-        }
-        #mCAL .curMonth {
-            text-align:center;
-            margin: 2px 0px;
-            background-color:#517AC8;
-            color:white;
-            font-size:14px;
-            font-weight:bold;
-        }
-
-
-
-/**** Month view ****/
-/* Table */
-#mCAL table#month
-{
-
-}
-
-#mCAL table#month *
-{
-    padding:0px;
-    margin:0px;
-}
-
-#mCAL table#month a
-{
-    text-decoration:none;
-}
-
-#mCAL table#month th
-{
-    -moz-box-sizing:border-box;
-    width:85px;
-    background-color:#517AC8;
-    text-align:center;
-    font-weight:bold;
-    color:white;
-}
-
-#mCAL table#month div
-{
-    position:relative;
-    width:85px;
-    height:85px;
-    margin:0px;
-    background-color:#E9ECF3;
-}
-
-#mCAL table#month ul 
-{
-    overflow:hidden;
-}
-
-#mCAL table#month .active 
-{
-    -moz-border-radius-topLeft:8px;
-    -moz-border-radius-bottomLeft:8px;
-    -moz-border-radius-bottomRight:8px;
-    vertical-align:top;
-    background-color:#CCD2E3;
-    border:solid #CCD2E3 1px;
-}
-
-#mCAL table#month .current 
-{
-    background-color:#FFE4B3;
-    border-color:orange;
-}
-
-#mCAL table#month .number 
-{
-    -moz-border-radius-bottomLeft:5px;
-    display:block;
-    position:absolute;
-    top:0px;
-    right:0px;
-    height:10px;
-    width:10px;
-    background-color:#516BA4;
-    color:white;
-    text-align:center;
-    vertical-align:middle;
-    padding:0px 3px 2px 2px;
-    font-weight:bold;
-}
-
-#mCAL table#month .current .number
-{
-    background-color:orange;
-    color:black;
-}
-
-#mCAL table#month .events 
-{
-    padding:3px;
-    padding-top:8px;
-    font-weight:bold;
-}
-
-#mCAL table#month .events a 
-{
-    color:#4F4F4F;
-    text-decoration:none;
-    font-size:9px;
-}
-
-#mCAL table#month .moreButton 
-{
-    border-style:none;
-    position:absolute;
-    bottom:0px;
-    width:100%;
-    height:9px;
-    background-color:#517AC8;
-    font-size:5px;
-    text-align:center;
-    -moz-border-radius-bottomLeft:8px;
-    -moz-border-radius-bottomRight:8px;
-}
-
-#mCAL table#month .moreButton img
-{
-    border:none;
-}
-
-{
-    background-color:orange;
-}
-
-
-/* MORE STYLES */
-
-#mCAL table#month .moreDisplay 
-{
-    position: absolute;
-    left: 0px;
-    top: 85px;
-    border:solid orange 1px;
-    border-top:solid orange 2px;
-    font-family:arial;
-    font-size:10px;
-    width:300px;
-    height: auto;
-    padding:2px;
-    background-color:#FFD3A8;
-    z-index: 100;
-}
-* html body table#month td { position: relative; z-index: 1; }
-</style>
-
diff --git a/docs/upgrades/templates-7.3.4/calendar_search.tmpl b/docs/upgrades/templates-7.3.4/calendar_search.tmpl
deleted file mode 100644
index 4215433bb..000000000
--- a/docs/upgrades/templates-7.3.4/calendar_search.tmpl
+++ /dev/null
@@ -1,319 +0,0 @@
-#CalendarSearch00000001
-<tmpl_if admin>
-    <p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-    <h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-    <tmpl_var description>
-</tmpl_if>
-
-
-<tmpl_var form.header>
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL" border="0">
-<tr>
-    <td style="text-align:right">
-        <a href="<tmpl_var url>?type=day" class="tab">Day</a>
-        <a href="<tmpl_var url>?type=week" class="tab">Week</a>
-        <a href="<tmpl_var url>?type=month" class="tab">Month</a>
-        <a href="<tmpl_var url>?func=search" class="tab active">Search</a>
-    </td>
-</tr>
-<tr>
-    <td class="months">
-        &nbsp;
-    </td>
-</tr>
-<tr>
-    <td style="width:100%">
-        <table width="100%" cellspacing="2" cellpadding="0">
-        <tr>
-            <td class="heading">
-                <div style="padding:4px;">Keyword</div>
-            </td>
-                                        <td class="day"><tmpl_var form.keywords>
-            </td>
-        </tr>
-        
-        <tr>
-            <td class="heading">
-                <div style="padding:4px;">Start Date</div>
-            </td>
-                                            <td class="day"><tmpl_var form.startDate>
-            </td>
-        </tr>
-
-        <tr>
-            <td class="heading">
-                <div style="padding:4px;">End Date</div>
-            </td>
-                                        <td class="day"><tmpl_var form.endDate>
-            </td>
-        </tr>
-
-        </table>
-    </td>
-</tr>
-<tr>
-    <td style="text-align:right">
-    <tmpl_var form.submit>
-    </td>
-</tr>
-</table>
-<tmpl_var form.footer>
-
-
-
-<tmpl_if results>
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL">
-<tr>
-    <td>
-        <div  class="curMonth">
-            Search Results
-            <span style="font-size:9px;">Displaying page <tmpl_var pagination.pageCount> of <tmpl_var pagination.pageCount></span>
-        </div>
-    </td>
-</tr>
-<tr>
-    <td class="months">
-                    <div style="padding:3px 0px;">
-            <tmpl_var pagination.firstPage>
-            <tmpl_var pagination.pageList>
-                <tmpl_var pagination.lastPage> 
-        </div>
-    </td>
-</tr>
-<tr>
-    <td style="width:100%">
-        <table width="100%" cellspacing="2" cellpadding="0">
-        <tmpl_loop results><tr>
-            <td class="heading">
-                <div style="padding:4px;"><tmpl_var startDate></div>
-            </td>
-            <td class="day">
-                <a href="<tmpl_var url>" style="padding-left:10px"><tmpl_var title></a>
-            </td>
-        </tr></tmpl_loop>
-        </table>
-    </td>
-</tr>
-<tr>
-    <td class="months">
-        <div style="padding:3px 0px;">
-            <tmpl_var pagination.firstPage>
-            <tmpl_var pagination.pageList>
-                <tmpl_var pagination.lastPage> 
-        </div>
-    </td>
-</tr>
-</table>
-</tmpl_if>
-~~~
-    <style type="text/css">
-        body * {
-            margin:0px;
-            }
-        #mCAL {
-            
-        }
-        #mCAL td {
-            font-size:10px;
-            font-family:arial;
-        }
-        #mCAL .tab {
-
-            border-bottom-style:none;
-            font-weight:bold;
-            padding: 2px 15px 0px 15px;
-            text-align;center;
-            background-color:#E9ECF3;
-            -moz-border-radius-topLeft:10px;
-            -moz-border-radius-topRight:10px;
-            color:#7588B5;
-            text-decoration:none;
-            font-size:10pt;
-            display:block;
-            float:left;
-            margin-right:5px;
-        }
-        #mCAL .tab:hover {
-            color:black;
-            }
-        #mCAL .active {
-            background-color:#DFE3EE;
-            color:#404F77;
-            border-bottom:solid #DFE3EE 1px;
-            }
-        #mCAL .controls {
-            float:right;
-            vertical-align:bottom;
-        }
-        #mCAL a {
-            font-size:11px;
-            color:#517AC8;
-            }
-        #mCAL .heading {
-            width:200px;
-            -moz-box-sizing:border-box;
-            background-color:#ABB7D1;
-            text-align:center;
-            font-weight:bold;
-            color:#374664;
-            font-size:9px;
-            letter-spacing:1px;
-            text-transform:uppercase;
-            text-align:right;
-            vertical-align:top;
-            -moz-border-radius-bottomRight:8px;
-                        -moz-border-radius-topRight:8px;
-        }
-        #mCAL .day {
-                        background-color:#E9ECF3;
-            width:400px;
-            position:relative;
-                    vertical-align:top;
-            -moz-border-radius-topLeft:8px;
-                        -moz-border-radius-bottomLeft:8px;
-            border:solid #CCD2E3 1px;
-        }
-        #mCAL .curDay {
-            background-color:#FFE4B3;
-            border-color:orange;
-        }
-                    #mCAL .dayWrapper {
-            height:100%;
-            width:100%;
-            position:relative;
-            z-index:0;
-                margin:0px;
-            padding:0px 0px 2px 5px;;
-            -moz-box-sizing:border-box;
-        }
-        html > body #mCAL .dayWrapper {
-            height:auto;
-            min-height:100%;
-        }
-        #mCAL .dayNum {
-            width:100%;
-            text-align:right;
-            
-        }
-
-                                    #mCAL span.border {
-                        text-align:center;
-            padding:5px;
-            font-weight:bold;
-            -moz-border-radius-bottomRight:5px;
-            -moz-border-radius-topLeft:5px;
-                        color:black;
-            border-right:solid #CCD2E3 1px;
-            border-bottom: solid #CCD2E3 1px;
-            background-color:#ABB7D1;
-            -moz-box-sizing:border-box;
-            top:5px;
-            position:relative;
-            
-        }
-        #mCAL .curDay span.border {
-            background-color:orange;
-            color:black;
-            border-color:orange;
-        }
-        #mCAL .event {
-            padding:3px;
-            padding-top:8px;
-            clear:left;
-                        font-weight:bold;
-        }
-        #mCAL .event a {
-            color:#4F4F4F;
-            text-decoration:none;
-            font-size:9px;
-        }
-        #mCAL .moreButton {
-            border-style:none;
-            z-index:5;
-            position:absolute;
-            bottom:0px;
-            width:100%;
-            height:9px;
-                background-color:#517AC8;
-            font-size:5px;
-            text-align:center;
-        }
-        #mCAL .moreButton:hover {
-            background-color:orange;
-        }
-        #mCAL .empty {
-            border-style:none;
-            background-color:#CCD2E3;
-            -moz-border-radius:10px;
-            
-        }
-        #mCAL .months {
-            text-align:center;
-                        background-color:#DFE3EE;
-        }
-        #mCAL .months a {
-            color:#517AC8;
-            text-decoration:none;
-        }
-        #mCAL .months .monthLink {
-                        text-decoration:none;
-            padding-left:5px;
-            padding-right:5px;
-            color:#AAB8D5;
-            font-size:12px;
-            font-weight:bold;
-            }
-        #mCAL .months .current {
-            color:#517AC8;
-        }
-        #mCAL .current {
-            font-weight:bold;
-            color:#517AC8;
-                        background-color:#fff;
-            -moz-border-radius:5px;
-        }
-        #mCAL .curMonth {
-            text-align:left;
-            margin: 2px 0px;
-            background-color:#517AC8;
-            color:white;
-            font-size:14px;
-            font-weight:bold;
-        }
-        
-        /* MORE STYLES */
-        #more1 {
-            position:absolute;
-            top:170px;
-                        left:10px;
-            
-        }
-        * html #more1 {
-            top:158px;
-            left:12px;
-
-        }
-        .moreDisplay {
-            border:solid orange 1px;
-            border-top:solid orange 2px;
-            font-family:arial;
-            font-size:10px;
-            width:300px;
-            padding:2px;
-            background-color:#FFD3A8;
-                        z-index:10;
-        }
-        ul.eventList {
-            margin:0px;
-            padding:0px;
-            margin-left:30px;
-            color:#526896;
-        }
-    </style>
-
diff --git a/docs/upgrades/templates-7.3.4/default_thread.tmpl b/docs/upgrades/templates-7.3.4/default_thread.tmpl
deleted file mode 100644
index 97ac7ebb5..000000000
--- a/docs/upgrades/templates-7.3.4/default_thread.tmpl
+++ /dev/null
@@ -1,9 +0,0 @@
-#PBtmpl0000000000000032
-
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>

<tmpl_if session.var.adminOn> 
	<p><tmpl_var controls></p>
</tmpl_if>

	
<div style="float: left; width: 70%">
	<h2><a href="<tmpl_var collaboration.url>"><tmpl_var collaboration.title></a></h2>
</div>
<div style="width: 30%; float: left; text-align: right;">
	<tmpl_if layout.isFlat>
		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
	<tmpl_else>
		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
	</tmpl_if>
</div>
<div style="clear: both;"></div>

<tmpl_loop post_loop>
	<tmpl_if layout.isNested><div style="margin-left: <tmpl_var depthX10>px;"></tmpl_if>
		<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
			<a name="id<tmpl_var assetId>"></a>
			<div class="postSubject">
				<tmpl_var title>
			</div>
			<div class="postData">
<tmpl_if avatar.url>
<div style="float: left; padding-right: 10px;">
<img src="<tmpl_var avatar.url>" alt="<tmpl_var username>" />
</div>
</tmpl_if>
				<div style="float: left; padding-right: 25px;">
					<b><tmpl_var user.label>:</b> 
						<tmpl_if user.isVisitor>
							<tmpl_var username>
						<tmpl_else>
							<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
						</tmpl_if>
						<br />
					<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
				</div>	
				<div>
					<b><tmpl_var views.label>:</b> <tmpl_var views><br />
					<b><tmpl_var rating.label>:</b> <tmpl_var rating>
-						<tmpl_if user.canPost>
							<tmpl_unless hasRated>
								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
							</tmpl_unless>
-						</tmpl_if>
						<br />
						<tmpl_if user.isPoster>
							<b><tmpl_var status.label>:</b> <tmpl_var status> [ <tmpl_if isArchived> <a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
						</tmpl_if>	
				</div>	
			</div>
			<div class="postMessage">
				<tmpl_var content>
<tmpl_loop attachment_loop>
	<div style="float: left; padding: 5px;">
		<a href="<tmpl_var url>">
			<tmpl_if isImage>
				<img src="<tmpl_var thumbnail>" style="border-style:none;" alt="<tmpl_var filename>" />
			<tmpl_else>
				<img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /></a> <a href="<tmpl_var url>"><tmpl_var filename>
			</tmpl_if>
		</a>
	</div>
</tmpl_loop>
<div style="clear: both;"></div>

			</div>
			<tmpl_unless isLocked>
				<div class="postControls">
					<tmpl_if user.canReply>
						<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a> &bull;
					</tmpl_if>
					<tmpl_if user.canEdit>
						<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
						<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
					</tmpl_if>
				</div>
			</tmpl_unless>
		</div>
	<tmpl_if layout.isNested></div></tmpl_if>
</tmpl_loop>

<tmpl_if pagination.pageCount.isMultiple>
	<div class="pagination" style="margin-top: 20px;">
		[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
	</div>
</tmpl_if>

<div style="margin-top: 20px;" class="bottomControls">
	<tmpl_if previous.url>
		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> &bull;
	</tmpl_if>	
	<tmpl_if next.url>
		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> &bull; 
	</tmpl_if>	
	<tmpl_if user.canPost>
		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
	</tmpl_if>
	<tmpl_if user.isModerator>
		<tmpl_if isSticky>
			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a> &bull;
		<tmpl_else>
			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a> &bull;
		</tmpl_if>
		<tmpl_if isLocked>
			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a> &bull;
		<tmpl_else>
			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a> &bull;
		</tmpl_if>
	</tmpl_if>
	<tmpl_unless user.isVisitor>
		<tmpl_if user.isSubscribed>
			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
		<tmpl_else>
			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
		</tmpl_if>
	</tmpl_unless>
</div>
-
-~~~
-
-<style type="text/css">
	.postBorder {
		border: 1px solid #cccccc;
		margin-bottom: 10px;
	}
 	.postBorderCurrent {
		border: 3px dotted black;
		margin-bottom: 10px;
	}
	.postSubject {
		border-bottom: 1px solid #cccccc;
		font-weight: bold;
		padding: 3px;
	}
	.postData {
		border-bottom: 1px solid #cccccc;
		font-size: 9pt;
		background-color: #eeeeee;
		color: black;
		padding: 3px;
	}
	.postData a {
		color:#29587E;
		text-decoration:underline;
	}
	.postData a:hover {
		text-decoration:none;
	}
	.postControls {
		border-top: 1px solid #cccccc;
		background-color: #676767;
		color: black;
		padding: 3px;
		text-align:right;
	}
	.postControls a:link, .postControls a:visited {
		color:white;
		text-decoration:underline;
	}
	.postControls a:hover {
		text-decoration:none;
	}
	.bottomControls {
		background-color:#676767;
		padding: 3px;
		text-align:right;
	}
	.bottomControls a:link, .bottomControls a:visited {
		color:white;
		text-decoration:underline;
	}	
	.bottomControls a:hover {
		text-decoration:none;
	}
	.postMessage {
		padding: 3px;
	}
	.currentThread {
		background-color: #eeeeee;
	}
	.threadHead {
		font-weight: bold;
		border-bottom: 1px solid #cccccc;
		font-size: 9pt;
		background-color: #eeeeee;
		color: black;
		padding: 3px;
	}
	.threadData {
		font-size: 11px;
		padding: 3px;
	}
</style>
diff --git a/docs/upgrades/templates-7.3.4/wiki_search.tmpl b/docs/upgrades/templates-7.3.4/wiki_search.tmpl
deleted file mode 100644
index dfddd6348..000000000
--- a/docs/upgrades/templates-7.3.4/wiki_search.tmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-#WikiSearchTmpl00000001
-
-<tmpl_if displayTitle><h2><tmpl_var searchLabel></h2></tmpl_if>
-
-
-<tmpl_var searchFormHeader><tmpl_var searchQuery><tmpl_var searchSubmit><tmpl_var searchFormFooter>
-<tmpl_if performSearch>
-	<h3><tmpl_var resultsLabel></h3>
-	<tmpl_if searchResults>
-		<ul><tmpl_loop searchResults><li><a href="<tmpl_var url>"><tmpl_var title></a></li></tmpl_loop></ul>
-		<tmpl_if pagination.pageCount.isMultiple>
-		<div class="pagination">
-			<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-		</div>
-		</tmpl_if>
-	<p><tmpl_var notWhatYouWanted></p>
-		<p><a href="<tmpl_var addPageUrl>"><tmpl_var addPageLabel></a></p>
-	<tmpl_else>
-		<p><tmpl_var nothingFoundLabel></p>
-		<tmpl_if canAddPages><p><a href="<tmpl_var addPageUrl>"><tmpl_var addPageLabel></a></p></tmpl_if>
-	</tmpl_if>
-</tmpl_if>
-<div style="padding: 8px;"><a href="<tmpl_var mostPopularUrl>"><tmpl_var mostPopularLabel></a> | <a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>
-~~~
-
-
diff --git a/docs/upgrades/templates-7.3.5/calendar_month.tmpl b/docs/upgrades/templates-7.3.5/calendar_month.tmpl
deleted file mode 100644
index c0fa80b67..000000000
--- a/docs/upgrades/templates-7.3.5/calendar_month.tmpl
+++ /dev/null
@@ -1,410 +0,0 @@
-#CalendarMonth000000001
-<tmpl_if admin>
-    <p><tmpl_var adminControls></p>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-    <h1><tmpl_var title></h1>
-</tmpl_if>
-
-<tmpl_if description>
-    <tmpl_var description>
-</tmpl_if>
-
-
-<table cellspacing="0" cellpadding="0" width="630" id="mCAL">
-<tr>
-    <td style="text-align:right">
-        <a class="tab" href="<tmpl_var urlDay>">Day</a>
-        <a class="tab" href="<tmpl_var urlWeek>">Week</a>
-        <a class="tab" href="<tmpl_var urlMonth>">Month</a>
-        <a class="tab" href="<tmpl_var urlSearch>">Search</a>
-
-        <div class="controls"><tmpl_if editor><a href="<tmpl_var urlAdd>">Add Event</a></tmpl_if> &bull; <a href="<tmpl_var urlPrint>">Print</a> 
-            <!--&bull; <a href="#">Subscribe</a>-->
-        </div>
-    </td>
-</tr>
-<tr>
-    <td class="months">
-        <div style="padding:3px 0px;">
-            <a href="<tmpl_var pagePrevUrl>" style="font-weight:bold;margin-right:8px;">&laquo; <tmpl_var pagePrevYear></a>&bull;
-            <tmpl_loop months>
-            <a style="margin-right:4px;" href="<tmpl_var monthUrl>" class="monthLink<tmpl_if monthCurrent> current</tmpl_if>"><tmpl_var monthAbbr></a>
-            </tmpl_loop>
-            &bull;
-                <a href="<tmpl_var pageNextUrl>" style="font-weight:bold;padding-left:8px"><tmpl_var pageNextYear> &raquo;</a> 
-        </div>
-    </td>
-</tr>
-<tr>
-    <td>
-        <div  class="curMonth">
-            <tmpl_var monthName> <tmpl_var year>
-        </div>
-    </td>
-</tr>
-<tr>
-    <td style="width:100%">
-    
-    <!-- the calendar table -->
-        <table id="month" width="100%" cellspacing="2" cellpadding="0">
-        <!-- day names -->
-        <tr><tmpl_loop dayNames>
-            <th><tmpl_var dayName></th>
-        </tmpl_loop></tr>
-        
-        <!-- the grid -->
-        <tmpl_loop weeks><tr>
-        <tmpl_loop days><td><div class="<tmpl_if dayMonth>active</tmpl_if><tmpl_if dayCurrent> current</tmpl_if>">
-            <tmpl_if dayMonth>
-               <a class="number" href="<tmpl_var dayUrl>"><tmpl_var dayMonth></a>
-            <tmpl_if events>
-            <ul class="events">
-			   <tmpl_loop events>
-                <li><a href="<tmpl_var eventUrl>">
-                    <tmpl_var eventMenuTitle>
-                </a>
-				</li>
-                </tmpl_loop>
-		    </ul>
-			
-			<a href="#" id="event_<tmpl_var dayMonth>" class="moreButton" onmouseover="return showEvents('overlay<tmpl_var dayMonth>');">
-				<img src="<tmpl_var extrasUrl>/wobject/Calendar/images/more.gif" />
-			</a>
-			
-            </tmpl_if> <!--/events-->
-            </tmpl_if> <!--/day-->
-        </div></td></tmpl_loop> <!--/days-->
-        </tr></tmpl_loop>
-    </table>
-</tr>
-</table>
-<tmpl_loop weeks><tmpl_loop days><tmpl_if events>
-      <div id="overlay<tmpl_var dayMonth>" class="moreDisplay">
-         <div>
-            <ul>
-			<tmpl_loop events>
-			<li><a href="<tmpl_var eventUrl>"><tmpl_var eventTitle></a><br/></li>
-            </tmpl_loop>
-		 </ul>            
-      </div>
-   </div>
-</tmpl_if></tmpl_loop></tmpl_loop>
-
-~~~
-
-<style type="text/css">
-		#mCAL * {
-			margin:0px;			
-		}
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style: none;
-			font-weight: bold;
-			padding: 2px 15px 0px 15px;
-			text-align: center;
-			background-color: #E9ECF3;
-			-moz-border-radius-topLeft: 10px;
-			-moz-border-radius-topRight: 10px;
-			color: #7588B5;
-			text-decoration: none;
-			font-size: 10pt;
-			display: block;
-			float: left;
-			margin-right: 5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL .controls {
-			float:right;
-			vertical-align:bottom;
-		}
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;			
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-
-		#mCAL .months .current, #mCAL .months .monthLink:hover {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:center;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-
-
-
-/**** Month view ****/
-/* Table */
-#mCAL table#month
-{
-
-}
-
-#mCAL table#month *
-{
-	padding:		0px;
-	margin:			0px;
-}
-
-#mCAL table#month a
-{
-	text-decoration:	none;
-}
-
-#mCAL table#month th
-{
-	-moz-box-sizing:border-box;
-	width:			85px;
-	background-color:	#517AC8;
-	text-align:		center;
-	font-weight:		bold;
-	color:			white;	
-}
-
-#mCAL table#month div
-{
-	position:		relative;
-	width:			85px;
-	height:			85px;
-	margin:			0px;
-	background-color:	#E9ECF3;
-}
-
-#mCAL table#month ul 
-{	
-	overflow:		hidden;
-}
-
-#mCAL table#month .active 
-{
-	-moz-border-radius-topLeft:	8px;
-	-moz-border-radius-bottomLeft:	8px;
-	-moz-border-radius-bottomRight:	8px;
-	vertical-align:		top;		
-	background-color:	#CCD2E3;
-	border:			solid #CCD2E3 1px;
-}
-
-#mCAL table#month .current 
-{
-	background-color:	#FFE4B3;
-	border-color:		orange;
-}
-
-#mCAL table#month .number 
-{
-	-moz-border-radius-bottomLeft:5px;
-	display:		block;
-	position:		absolute;
-	top:			0px;
-	right:			0px;
-	height:			10px;
-	width:			10px;
-	background-color:	#516BA4;
-	color:			white;
-	text-align:		center;
-	vertical-align:		middle;
-	padding:		0px 3px 2px 2px;
-	font-weight:		bold;
-}
-
-#mCAL table#month .current .number
-{
-	background-color:	orange;
-	color:			black;
-}
-
-#mCAL table#month .events 
-{
-	padding:		3px;
-	padding-top:		8px;
-	font-weight:		bold;			
-}
-
-#mCAL table#month .events a 
-{
-	color:			#4F4F4F;
-	text-decoration:	none;
-	font-size:		9px;
-}
-
-#mCAL table#month .moreButton 
-{
-	border-style:		none;
-	position:		absolute;
-	bottom:			0px;
-	width:			100%;
-	height:			9px;
-	background-color:	#517AC8;	
-	font-size:		5px;
-	text-align:		center;
-	-moz-border-radius-bottomLeft:	8px;
-	-moz-border-radius-bottomRight:	8px;
-}
-
-#mCAL table#month .moreButton img
-{
-	border:			none;
-}
-
-
-/* MORE STYLES */
-
-.moreDisplay 
-{
-	position: 		absolute;
-	border:			solid orange 1px;
-	border-top:		solid orange 2px;
-	font-family:		arial;
-	font-size:		10px;
-	width:			300px;
-	height: 		auto;
-	padding:		2px;
-	background-color:	#FFD3A8;
-	color:			black;
-	display:        none;
-	z-index: 		100;
-}
-
-.moreDisplay a {
-   color: black;
-}
-
-* html body table#month td { position: relative; z-index: 1; }
-</style>
-
-<script type="text/javascript" src='^Extras;yui/build/yahoo/yahoo.js'></script>
-<script type="text/javascript" src='^Extras;yui/build/event/event.js' ></script>
-
-<script>
-<!--
-//<![CDATA[
-	
-   //-----------------------------------------------------------------------------------   	
-   function isSelfOrChildOf(parent,node) {
-      if(parent == node) return true;
-	  if(parent == null || node == null) return false;
-	  var childLen = parent.childNodes.length;
-      for (var i = 0; i < childLen; i++) {
-         var child = parent.childNodes[i];
-	     if(child.nodeType != 1) continue; //Skip text and attribute nodes
-	     if(isSelfOrChildOf (child,node)) {
-	        return true;
-	     }
-      }
-      return false;
-   }	
-   
-   //-----------------------------------------------------------------------------------   
-   function findParentNodeFromChild (node,tagName) {
-      if(node == null) return node;
-	  var parent = node.parentNode;
-	  if(parent == null) return node;
-	  if(parent.tagName == tagName) {
-	     return parent;
-	  }
-	  return findParentNodeFromChild (parent,tagName);
-   }
-   
-   
-   //-----------------------------------------------------------------------------------   
-   function showEvents(eventId) {
-	  var evt = YAHOO.util.Event.getEvent();
-      var targ = YAHOO.util.Event.getTarget(evt);
-	  
-	  var elem = document.getElementById(eventId);
-	  var td;
-      var pPagex;
-      var pPagey;
-          
-      //IE is stupid
-      var isIE = navigator.userAgent.indexOf("MSIE") > -1;
-      var isIE7 = navigator.userAgent.indexOf("MSIE 7") > -1;
-      if(isIE && !isIE7) {
-         //IE 6 and below don't register offsetTop or offsetLeft for the div
-         td = findParentNodeFromChild(targ,"TD");
-         pPagex = td.offsetTop;
-         pPagey = td.offsetLeft;
-      } else {
-         var cDiv = findParentNodeFromChild(targ,"DIV");
-	     pPagex = cDiv.offsetTop;
-	     pPagey = cDiv.offsetLeft;
-         td = findParentNodeFromChild(cDiv,"TD");
-      }
-      
-      var tdHeight = td.offsetHeight;
-
-	  var eventX = tdHeight + pPagex;
-	  var eventY = pPagey;
-		  
-	  elem.style.top = eventX + 'px';
-	  elem.style.left = eventY + 'px';
-	  elem.style.display = "block";
-      
-	  //Register listener
-	  YAHOO.util.Event.addListener(document.body,"mousemove",hideEvents,{ "targ":targ, "elem": elem, "td": td })
-	  return false;
-   }
-   
-   //-----------------------------------------------------------------------------------   
-   function hideEvents(e, el) {
-	  if(!e || !el) return;
-	  
-	  var elem = el.elem;
-	  var td = el.td;
-	  var targ = el.targ;
-	  
-	  var evtTarg = YAHOO.util.Event.getTarget(e);
-	  
-	  var inDiv = isSelfOrChildOf(elem,evtTarg);
-      var inTd = isSelfOrChildOf(td,evtTarg);
-	  var inTarget = isSelfOrChildOf(targ,evtTarg);
-	  
-	  if(inDiv || inTd || inTarget) {
-	     //do nothing
-	  } else {
-	     elem.style.display = "none";
-		 YAHOO.util.Event.removeListener (document.body,"mousemove",hideEvents);    
-	  }
-	  return false;
-   }
-   
-//]]>
--->      
-</script>
-
diff --git a/docs/upgrades/templates-7.3.5/cs_rss.tmpl b/docs/upgrades/templates-7.3.5/cs_rss.tmpl
deleted file mode 100644
index dc6f35033..000000000
--- a/docs/upgrades/templates-7.3.5/cs_rss.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-#PBtmpl0000000000000142
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0">
-<channel>
-<title><tmpl_var title ESCAPE="HTML"></title>
-<link><tmpl_var link></link>
-<description><tmpl_var description></description>
-<tmpl_loop item_loop>
-<item>
-<title><tmpl_var title ESCAPE="HTML"></title>
-<link><tmpl_var link></link>
-<description><tmpl_var description></description>
-<guid isPermaLink="true"><tmpl_var guid></guid>
-<pubDate><tmpl_var pubDate></pubDate>
-</item>
-</tmpl_loop>
-</channel>
-</rss>
diff --git a/docs/upgrades/templates-7.3.5/viewProjectTask.tmpl b/docs/upgrades/templates-7.3.5/viewProjectTask.tmpl
deleted file mode 100644
index 6c0dc49c6..000000000
--- a/docs/upgrades/templates-7.3.5/viewProjectTask.tmpl
+++ /dev/null
@@ -1,81 +0,0 @@
-#ProjectManagerTMPL0002
-<script type="text/javascript">
-//<![CDATA[
-dunits = "<tmpl_var project.durationUnits>";
-hoursPerDay = <tmpl_var project.hoursPerDay>;
-taskLength = <tmpl_var project.task.length>;
-extrasPath = '<tmpl_var extras>';
-errorMsgs = {
-   'name' : "<tmpl_var form.name.error>",
-   'start' : "<tmpl_var form.start.error>",
-   'end' : "<tmpl_var form.end.error>",
-   'greaterthan' : "<tmpl_var form.greaterthan.error>",
-   'invalidMove' : "<tmpl_var form.invalidMove.error>",
-   'noPredecessor' : "<tmpl_var form.noPredecessor.error>",
-   'samePredecessor' : "<tmpl_var form.samePredecessor.error>",
-   'previousPredecessor' : "<tmpl_var form.previousPredecessor.error>",
-   'untimedPredecessor' : "<tmpl_var form.untimedPredecessor.error>"
-};
-
-addEvent(window, "load", initPopUp);
-//]]>
-</script>
-<tmpl_var form.header>
-<table cellpadding="0" cellspacing="0" border="0" class="project" id="mastertable" style="width:<tmpl_var project.table.width>px;">
-   <tbody>
-      <tr>
-         <td style="width:20px;height:20px;">&nbsp;</td>
-	     <td style="width:300px;" align="center">Task Name</td>
-	     <td style="width:70px;" align="center">Duration</td>
-	     <td style="width:70px;" align="center">Start</td>
-	     <td style="width:70px;" align="center">Finish</td>
-	     <td style="width:30px;" align="center">Pred</td>
-	     <td rowspan="<tmpl_var project.gantt.rowspan>" valign="top" id="scrolltd" style="border-style:none;width:<tmpl_var project.scroll.percentWidth>%;">
-	        <div class="scroller" id="gantt">
-			   <tmpl_var project.ganttChart>
-		    </div>
-	     </td>
-      </tr>
-      <tr>
-	     <td colspan="6">&nbsp;</td>
-      </tr>
-      <tmpl_loop task.loop>
-      <tr id="<tmpl_var task.row.id>">
-	     <td align="center" style="height:20px"><tmpl_var task.number></td>
-	     <td align="left" style="height:20px">
-	        <tmpl_if task.canAdd>
-		       <script type="text/javascript">
-			   //<![CDATA[
-                   var cMenu = new cMenu_createWithLink("id_<tmpl_var task.number>","<tmpl_var task.name ESCAPE="JS">");
-				   cMenu.addLink("<tmpl_var task.edit.url>","<tmpl_var task.edit.label>");
-				   cMenu.addLink("<tmpl_var task.insertAbove.url>","<tmpl_var task.insertAbove.label>");
-				   cMenu.addLink("<tmpl_var task.insertBelow.url>","<tmpl_var task.insertBelow.label>");
-				   cMenu.addLink("<tmpl_var task.delete.url>","<tmpl_var task.delete.label>");
-				   cMenu.print();
-				//]]>
-               </script>
-			   <!-- <a href="<tmpl_var task.edit.url>" class="submodal-400-350"><tmpl_var task.name></a> -->
-		    <tmpl_else>
-		       <tmpl_var task.name>
-		    </tmpl_if>
-	     </td>
-	     <td align="center" style="height:20px"><tmpl_var task.duration> <tmpl_var task.duration.units></td>
-	     <td align="center" style="height:20px"><tmpl_var task.start></td>
-	     <td align="center" style="height:20px"><tmpl_var task.end></td>
-	     <td align="center" style="height:20px"><tmpl_var task.dependants></td>	
-	     <tmpl_var task.lagTime>
-	     <tmpl_var task.taskType><tmpl_var task.seqNum>
-      </tr>
-      </tmpl_loop>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-      <tr><td colspan="6" style="border-style:none;">&nbsp;</td></tr>
-   </tbody>
-</table>
-<tmpl_var form.footer>
-
-<div id="links">
-<!-- 	<tmpl_if project.canEdit><a href="<tmpl_var task.resources.url>"><tmpl_var task.resources.label></a>&nbsp;|&nbsp;</tmpl_if> -->
-	<tmpl_if task.canAdd><a href="<tmpl_var task.add.url>" class="submodal-400-300"><tmpl_var task.add.label></a>&nbsp;|&nbsp;</tmpl_if>
-	<a href="<tmpl_var task.back.url>"><tmpl_var task.back.label></a>
-</div>
-
diff --git a/docs/upgrades/templates-7.3.5/wiki-front-page.tmpl b/docs/upgrades/templates-7.3.5/wiki-front-page.tmpl
deleted file mode 100644
index 459077ed2..000000000
--- a/docs/upgrades/templates-7.3.5/wiki-front-page.tmpl
+++ /dev/null
@@ -1,30 +0,0 @@
-#WikiFrontTmpl000000001
-<tmpl_if session.var.adminOn><p><tmpl_var controls></p></tmpl_if>
-<tmpl_if displayTitle><h2><tmpl_var title></h2></tmpl_if>
-
-<tmpl_var description>
-<h3><tmpl_var searchLabel></h3>
-<tmpl_var searchFormHeader><tmpl_var searchQuery><tmpl_var searchSubmit><tmpl_var searchFormFooter>
-<br />
-
-<div style="float: left; width: 50%;">
-	<h3><a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a></h3>
-	<ul><tmpl_loop recentChanges>
-		<li>
-			<tmpl_if isAvailable>
-				<a href="<tmpl_var url>"><tmpl_var title></a>
-			<tmpl_else>
-				<tmpl_var title> (<tmpl_var actionTaken>)
-			</tmpl_if>
-		</li>
-	</tmpl_loop></ul>
-</div>
-<div style="float: left;">
-	<h3><a href="<tmpl_var mostPopularUrl>"><tmpl_var mostPopularLabel></a></h3>
-	<ol><tmpl_loop mostPopular>
-		<li><a href="<tmpl_var url>"><tmpl_var title></a></li>
-	</tmpl_loop></ol>
-
-</div>
-<div style="clear: both;"></div>
-
diff --git a/docs/upgrades/templates-7.3.5/wiki-page.tmpl b/docs/upgrades/templates-7.3.5/wiki-page.tmpl
deleted file mode 100644
index def5b907f..000000000
--- a/docs/upgrades/templates-7.3.5/wiki-page.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-#WikiPageEditTmpl000001
-<tmpl_var formHeader>
-<table>
-<tbody>
-<tr><td><label for="title_formId"><tmpl_var titleLabel></label></td><td><tmpl_var formTitle></td></tr>
-<tr><td><label for="content_formId"><tmpl_var contentLabel></label></td><td><tmpl_var formContent></td></tr>
-<tmpl_if canAdminister>
-	<tr><td><label for="isProtected_formId"><tmpl_var protectQuestionLabel></label></td><td><tmpl_var formProtect></td></tr>
-</tmpl_if>
-<tmpl_if allowsAttachments>
-	<tr><td><label for="storageId_formId"><tmpl_var attachmentLabel></label></td><td><tmpl_var formAttachment></td></tr>
-</tmpl_if>
-</tbody>
-</table>
-<tmpl_var formSubmit>
-<tmpl_var formFooter>
-
-<tmpl_if canAdminister><tmpl_unless isNew>
-	<ul>
-		<li><a href="<tmpl_var deleteUrl>" onclick="return confirm('<tmpl_var deleteConfirm ESCAPE="JS">');"><tmpl_var deleteLabel></a></li>
-	</ul>
-</tmpl_unless></tmpl_if>
-
-
diff --git a/docs/upgrades/templates-7.3.5/wiki-recent-changes.tmpl b/docs/upgrades/templates-7.3.5/wiki-recent-changes.tmpl
deleted file mode 100644
index 11c591635..000000000
--- a/docs/upgrades/templates-7.3.5/wiki-recent-changes.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-#WikiRCTmpl000000000001
-<h2><tmpl_var title></h2>
-
-<ul><tmpl_loop recentChanges>
-	<li>
-		<tmpl_if isAvailable>
-			<a href="<tmpl_var url>"><tmpl_var title></a> - <tmpl_var actionTaken> on <tmpl_var date> by <tmpl_var username>
-		<tmpl_else>
-			<tmpl_var title> - <tmpl_var actionTaken> on <tmpl_var date> by <tmpl_var username> 
-			<tmpl_if canAdminister>
-				( <a href="<tmpl_var restoreUrl>"><tmpl_var restoreLabel></a> )
-			</tmpl_if>
-		</tmpl_if>
-	</li>
-</tmpl_loop></ul>
-
-<div style="padding: 8px;"><a href="<tmpl_var searchUrl>"><tmpl_var searchLabel></a> | <a href="<tmpl_var mostPopularUrl>"><tmpl_var mostPopularLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>
-
-
diff --git a/docs/upgrades/templates-7.3.6/PBtmpl0000000000000068.tmpl b/docs/upgrades/templates-7.3.6/PBtmpl0000000000000068.tmpl
deleted file mode 100644
index 7c2e0afa2..000000000
--- a/docs/upgrades/templates-7.3.6/PBtmpl0000000000000068.tmpl
+++ /dev/null
@@ -1,80 +0,0 @@
-#PBtmpl0000000000000068
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
-<tmpl_unless isReply><tmpl_if preview.synopsis><p><i><tmpl_var preview.synopsis></i></p></tmpl_if></tmpl_unless>
-<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
-
-<tmpl_if isReply>
-	<h1><tmpl_var message.header.label></h1>
-<tmpl_else>
-	<h1><tmpl_var submission.header.label></h1>
-</tmpl_if>
-
-<tmpl_var form.header>
-<table class="defaultSubmissionForm">
-	<tmpl_if isNewPost>
-		<tmpl_if user.isVisitor>
-			<tr>
-				<td><tmpl_var visitorName.label></td>
-				<td><tmpl_var visitorName.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td><tmpl_var title.label></td>
-		<td><tmpl_var title.form></td>
-	</tr>
-	<tmpl_unless isReply>
-		<tr>
-			<td><tmpl_var synopsis.label></td>
-			<td><tmpl_var synopsis.form></td>
-		</tr>
-	</tmpl_unless>
-	<tr>
-		<td><tmpl_var body.label></td>
-		<td><tmpl_var content.form></td>
-	</tr>
-	<tmpl_unless isReply>
-		<tmpl_if attachment.form>
-			<tr>
-				<td><tmpl_var attachment.label></td>
-				<td><tmpl_var attachment.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<div class="defaultSubmissionFormContent">
-	<b><tmpl_var reply.title></b><br /><br />
-	<tmpl_var reply.content>
-	</div>
-</tmpl_if>
-
-
diff --git a/docs/upgrades/templates-7.3.6/PBtmpl0000000000000122.tmpl b/docs/upgrades/templates-7.3.6/PBtmpl0000000000000122.tmpl
deleted file mode 100644
index 1afc3a6e5..000000000
--- a/docs/upgrades/templates-7.3.6/PBtmpl0000000000000122.tmpl
+++ /dev/null
@@ -1,99 +0,0 @@
-#PBtmpl0000000000000122
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<div class="jobSubmissionFormContent">
-	<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
-	<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
-	<tmpl_if preview.userDefined3><p><tmpl_var preview.userDefined3></p></tmpl_if>
-	<tmpl_if preview.userDefined1><p><tmpl_var preview.userDefined1></p></tmpl_if>
-	<tmpl_if preview.userDefined2><p><tmpl_var preview.userDefined2></p></tmpl_if>
-</div>
-
-<tmpl_if isReply>
-	<h2><tmpl_var message.header.label></h2>
-<tmpl_else>
-	<h2><tmpl_var job.header.label></h2>
-</tmpl_if>
-
-<tmpl_var form.header>
-<table class="jobSubmissionFormContent">
-	<tmpl_if isReply>
-		<tr>
-			<td><tmpl_var subject.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var message.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-	<tmpl_else>
-		<tr>
-			<td><tmpl_var job.title.label></td>
-			<td><tmpl_var title.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var synopsis.label></td>
-			<td><tmpl_var synopsis.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var job.description.label></td>
-			<td><tmpl_var content.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var job.requirements.label></td>
-			<td><tmpl_var userDefined3.form.htmlarea></td>
-		</tr>
-		<tr>
-			<td><tmpl_var compensation.label></td>
-			<td><tmpl_var userDefined1.form></td>
-		</tr>
-		<tr>
-			<td><tmpl_var location.label></td>
-			<td><tmpl_var userDefined2.form></td>
-		</tr>
-		<tmpl_if attachment.form>
-			<tr>
-				<td><tmpl_var attachment.label></td>
-				<td><tmpl_var attachment.form></td>
-			</tr>
-		</tmpl_if>
-	</tmpl_if>
-	<tmpl_if isNewPost>
-		<tmpl_unless user.isVisitor>
-			<tr>
-				<td><tmpl_var subscribe.label></td>
-				<td><tmpl_var subscribe.form></td>
-			</tr>
-		</tmpl_unless>
-		<tmpl_if isNewThread>
-			<tmpl_if user.isModerator>
-				<tr>
-					<td><tmpl_var lock.label></td>
-					<td><tmpl_var lock.form></td>
-				</tr>
-				<tr>
-					<td><tmpl_var stick.label></td>
-					<td><tmpl_var sticky.form></td>
-				</tr>
-			</tmpl_if>
-		</tmpl_if>
-	</tmpl_if>
-	<tr>
-		<td></td>
-		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
-	</tr>
-</table>
-<tmpl_var form.footer>
-
-<tmpl_if isReply>
-	<div class="jobSubmissionFormContent">
-		<b><tmpl_var reply.title></b><br /><br />
-		<tmpl_var reply.content>
-		<tmpl_if reply.userDefined3><p><tmpl_var reply.userDefined3></p></tmpl_if>
-		<tmpl_if reply.userDefined1><p><tmpl_var reply.userDefined1></p></tmpl_if>
-		<tmpl_if reply.userDefined2><p><tmpl_var reply.userDefined2></p></tmpl_if>
-	</div>
-</tmpl_if>
-<p /><p />
-
-
diff --git a/docs/upgrades/templates-7.3.6/ZipArchiveTMPL00000001.tmpl b/docs/upgrades/templates-7.3.6/ZipArchiveTMPL00000001.tmpl
deleted file mode 100644
index 0beee4ce0..000000000
--- a/docs/upgrades/templates-7.3.6/ZipArchiveTMPL00000001.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-#ZipArchiveTMPL00000001
-
-<tmpl_if session.var.adminOn>
-   <tmpl_if controls>
-      <p><tmpl_var controls></p>
-   </tmpl_if>
-</tmpl_if>
-
-<tmpl_if error>
-<ul>
-  <li><tmpl_var error></li>
-</ul>
-</tmpl_if>
-
-<tmpl_if fileUrl>
-   <a href="<tmpl_var fileUrl>"><tmpl_var title></a>
-<tmpl_else>
-  <tmpl_if pageError>
-      Error:  No initial page specified
-  <tmpl_else>
-      Error:  No file specified
-  </tmpl_if>
-</tmpl_if>	
diff --git a/docs/upgrades/templates-7.3.7/ZipArchiveTMPL00000001.tmpl b/docs/upgrades/templates-7.3.7/ZipArchiveTMPL00000001.tmpl
deleted file mode 100644
index 228e197eb..000000000
--- a/docs/upgrades/templates-7.3.7/ZipArchiveTMPL00000001.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-#ZipArchiveTMPL00000001
-
-<tmpl_if session.var.adminOn>
-   <tmpl_if controls>
-      <p><tmpl_var controls></p>
-   </tmpl_if>
-</tmpl_if>
-
-<tmpl_if error>
-<ul>
-  <li><tmpl_var error></li>
-</ul>
-</tmpl_if>
-
-<tmpl_if fileUrl>
-   <a href="<tmpl_var fileUrl>"><tmpl_var title></a>
-<tmpl_else>
-  <tmpl_if pageError>
-      <tmpl_var noInitialPage>
-  <tmpl_else>
-      <tmpl_var noFileSpecified>
-  </tmpl_if>
-</tmpl_if>	
diff --git a/docs/upgrades/templates-7.3.8/ProjectManagerTMPL0004.tmpl b/docs/upgrades/templates-7.3.8/ProjectManagerTMPL0004.tmpl
deleted file mode 100644
index f2d9eceed..000000000
--- a/docs/upgrades/templates-7.3.8/ProjectManagerTMPL0004.tmpl
+++ /dev/null
@@ -1,80 +0,0 @@
-#ProjectManagerTMPL0004
-
-<tmpl_var form.header><tmpl_var form.seqNum>
-<table class="popUp" cellspacing="0" cellpadding="3" border="0">
-<tbody>
-<tr>
-        <td align="right" style="width:25%;" class="header"><tmpl_var task_name_label>&nbsp;</td>
-        <td style="width:75%;"><tmpl_var form.name></td>
-</tr>
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clear">
-                        <td style="width:25%;" align="right" class="header"><tmpl_var task_start_label>&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.start></td>
-                        <td style="width:25%;" align="right" class="header"><tmpl_var task_finish_label>&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.end></td>
-                </tr><tr class="clear">
-			<td style="width:100%; text-align: center" colspan="4" class="header"><tmpl_var form.taskType></td>
-		</tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clear">
-                        <td style="width:25%; text-align:right" class="header"><tmpl_var task_duration_label>&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.duration>&nbsp;<tmpl_var form.duration.units></td>
-                        <td style="width:25%; text-align:right" class="header"><tmpl_var task_lagTime_label> Time&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.lagTime>&nbsp;<tmpl_var form.lagTime.units></td>
-                </tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clear">
-                        <td style="width:25%;" align="right" class="header"><tmpl_var task_predecessor_label>&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.dependants></td>
-                        <td style="width:25%;" align="right" class="header"><tmpl_var task_complete_label>&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.percentComplete></td>
-                </tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clearNoBG" style="text-align:center;">
-                        <td style="text-align:left;">
-                           <span class="header"><tmpl_var task_resource_label>:</span><br /><br />
-                           <span style="margin-bottom:2px;padding-bottom:2px;padding-left:5px;-moz-box-sizing:border-box;display:block;">
-                              <a style="text-decoration:none;" id="<tmpl_var form.addUser.id>" href="<tmpl_var form.addUser.link>" target="_new" onclick="taskEdit_searchPopup(this.href); return false;"><img style="border-style:none;vertical-align:middle;" title="<tmpl_var form.addUser.text>" alt="<tmpl_var form.addUser.text>" src="<tmpl_var assetExtras>/users.gif" /><span style="text-decoration:none;font-size:8pt;"> <tmpl_var form.addUser.text></span></a>&nbsp;&nbsp;&nbsp;&nbsp;
-                              <a style="text-decoration:none;" id="<tmpl_var form.addGroup.id>" href="<tmpl_var form.addGroup.link>" target="_new" onclick="taskEdit_searchPopup(this.href); return false;"><img style="border-style:none;vertical-align:middle;" title="<tmpl_var form.addGroup.text>" alt="<tmpl_var form.addGroup.text>" src="<tmpl_var assetExtras>/groups.gif" /><span style="text-decoration:none;font-size:8pt;"> <tmpl_var form.addGroup.text></span></a>
-                           </span><tmpl_var form.resourceDiv>
-                        </td>
-                </tr>
-                <tr>
-                        <td style="text-align:right;" class="header"><a href="javascript:void(checkEditTaskForm(document.editTaskForm))" class="saveBtn"><tmpl_var task_save_label></a></td>
-                </tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-
-
-</tbody>
-</table>
-<tmpl_var form.footer>
-
diff --git a/docs/upgrades/templates-7.3.8/inOutTemplate.tmpl b/docs/upgrades/templates-7.3.8/inOutTemplate.tmpl
deleted file mode 100644
index 4415bc7a6..000000000
--- a/docs/upgrades/templates-7.3.8/inOutTemplate.tmpl
+++ /dev/null
@@ -1,51 +0,0 @@
-#IOB0000000000000000001
-#namespace:InOutBoard
-<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> 
-
-<div class="fontSettings">
-	<tmpl_var description>
-	<br /><br />
-</div>
-
-<div class="pagination">
-<tmpl_if selectDelegatesURL>
-   <a href="<tmpl_var selectDelegatesURL>"><tmpl_var selectDelegatesLabel></a>
-</tmpl_if>
-<tmpl_if canViewReport>
-   <tmpl_if selectDelegatesURL>
-      &nbsp;&middot;&nbsp;
-   </tmpl_if>
-   <a href="<tmpl_var viewReportURL>"><tmpl_var viewReportLabel></a>
-</tmpl_if>
-</div>
-
-<tmpl_if displayForm>	
-	<div class="fontSettings">
-		<tmpl_var form>
-	</div>	
-</tmpl_if>
-   
-   <table width="100%" cellpadding="3" cellspacing="0" class="iob">
-   <tmpl_loop rows_loop>
-   <tmpl_if deptHasChanged>
-   <tr><td colspan="4" class="noBorder"><br /><b><tmpl_var department></b></td></tr>
-   </tmpl_if>
-   <tr>
-   <td<tmpl_if __ODD__> class="odd"</tmpl_if>><tmpl_var username></td>
-   <td<tmpl_if __ODD__> class="odd"</tmpl_if>><tmpl_var status></td>
-   <td<tmpl_if __ODD__> class="odd"</tmpl_if>><tmpl_var dateStamp></td>
-   <td<tmpl_if __ODD__> class="odd"</tmpl_if>><tmpl_var message></td>
-   </tr>
-   </tmpl_loop>
-   <tr><td colspan="4"><tmpl_var paginateBar></td></tr>
-   </table>
-   
-   
-
diff --git a/docs/upgrades/templates-7.3.9/EventManagerCheckout.tmpl b/docs/upgrades/templates-7.3.9/EventManagerCheckout.tmpl
deleted file mode 100644
index 69aafb77d..000000000
--- a/docs/upgrades/templates-7.3.9/EventManagerCheckout.tmpl
+++ /dev/null
@@ -1,122 +0,0 @@
-#EventManagerTmpl000003
-
-<tmpl_if resolveConflicts>
-<tmpl_var form.header>
-<table width="100%" border="0">
-<tr><td><tmpl_var message></td></tr>
-
-<tr>
-	<td>
-		<table width="100%">
- <tmpl_loop conflict_loop>
-		<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>>
-			<td><tmpl_var form.deleteControl></td>
-			<td><tmpl_var title></td>
-			<td><tmpl_var description></td>
-			<td><tmpl_var price></td>
-		</tr>
- </tmpl_loop>
-		</table>
-	</td>
-</tr> 
-<tr><td><tmpl_var form.submit></td></tr>
-</table>
-<tmpl_var form.footer>
-</tmpl_if>
-
-
-
-
-<tmpl_if registration>
-  <tmpl_var form.header>
-  <tmpl_var form.message>
-  <tmpl_var form.chooserJS>
-  <table style="border-top:solid gray 1px;width:100%;margin-top:5px;">
-<tbody>
-<tmpl_if isError>
- <tr><td colspan='2'>
-  <ul>
-   <tmpl_loop errorLoop>
-    <li><span style='color: red; font-weight: bold;'><tmpl_var error></span></li>
-   </tmpl_loop>
-  </ul>
-  </td></tr>
-</tmpl_if>
-
-<tmpl_if form.badgeId><tr><td><tmpl_var form.badgeId.label></td><td><tmpl_var form.badgeId></td></tr></tmpl_if>
-  <tr><td><tmpl_var form.firstName.label></td><td><tmpl_var form.firstName></td></tr>
-<tr><td><tmpl_var form.lastName.label></td><td><tmpl_var form.lastName></td></tr>
-<tr><td><tmpl_var form.address.label></td><td><tmpl_var form.address></td></tr>
-<tr><td><tmpl_var form.city.label></td><td><tmpl_var form.city></td></tr>
-<tr><td><tmpl_var form.state.label></td><td><tmpl_var form.state></td></tr>
-<tr><td><tmpl_var form.zipcode.label></td><td><tmpl_var form.zipcode></td></tr>
-<tr><td><tmpl_var form.country.label></td><td><tmpl_var form.country></td></tr>
-<tr><td><tmpl_var form.phoneNumber.label></td><td><tmpl_var form.phoneNumber></td></tr>
-<tr><td><tmpl_var form.email.label></td><td><tmpl_var form.email></td></tr>
-<tr><td colspan="2"><br /><tmpl_var form.submit><a href="<tmpl_var cancelRegistration.url>" style="text-align: right;"><tmpl_var cancelRegistration.url.label></a></td></tr>
-</tbody>
-</table>
-<script type="text/javascript">
-
-function swapBadgeInfo(badgeId) {
-	var selector = document.getElementById('badgeId_formId');
-	for (var i in badges[badgeId]) {
-		var field = document.getElementById(i+'_formId');
-		if (field && badges[badgeId][i]) {
-			field.value=badges[badgeId][i];
-		} else {
-			if (field) field.value='';
-		}
-	}
-}	
-
-var selector1 = document.getElementById('badgeId_formId');
-if (selector1) {
-	swapBadgeInfo(selector1.value);
-}
-
-</script>
-<tmpl_var form.footer>
-</tmpl_if>
-
-<tmpl_if prereqsAreMissing>
-<tmpl_var form.header>
-<table border="1">
-
-<tmpl_loop message_loop>
-<tr>
-	<td colspan="4"><strong><tmpl_var title> requires all of the following:</strong></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<ul>
-<tmpl_loop messageLoop>
-			<li><tmpl_var reqmessage></li>
-</tmpl_loop>
-		</ul>
-	</td>
-</tr>
-</tmpl_loop>
-
-<tmpl_loop missingEvents_loop>
-<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>><td><tmpl_var form.checkBox></td><td><tmpl_var title></td><td><tmpl_var description></td><td><tmpl_var price></td></tr>
-</tmpl_loop>
-<tr><td colspan="4"><br /><tmpl_var form.submit></td></tr>
-</table>
-<tmpl_var form.footer>
-
-</tmpl_if>
-
-~~~
-
-<style type="text/css">
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-</style>
-
diff --git a/docs/upgrades/templates-7.3.9/PBtmpl0000000000000080.tmpl b/docs/upgrades/templates-7.3.9/PBtmpl0000000000000080.tmpl
deleted file mode 100644
index 7e8331df2..000000000
--- a/docs/upgrades/templates-7.3.9/PBtmpl0000000000000080.tmpl
+++ /dev/null
@@ -1,70 +0,0 @@
-#PBtmpl0000000000000080
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
-
-<tmpl_if session.var.adminOn>
-	<tmpl_var controls>
-</tmpl_if>
-
-<tmpl_if displayTitle>
-	<h2><tmpl_var title></h2>
-</tmpl_if>
-
-<tmpl_if description>
-	<tmpl_var description>
-</tmpl_if>
-
-<p>
-	<tmpl_if user.canPost>
-		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
-	</tmpl_if>
-	<tmpl_unless user.isVisitor>
-		<tmpl_if user.isSubscribed>
-			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
-		<tmpl_else>
-			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
-		</tmpl_if>
-		<tmpl_if pagination.pageCount.isMultiple>
-			&bull;
-		</tmpl_if>
-	</tmpl_unless>
-	<tmpl_if pagination.pageCount.isMultiple>
-		<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
-	</tmpl_if>
-</p>
-
-<ul>
-	<tmpl_loop post_loop>
-	   <li><a href="#id<tmpl_var assetId>"><span class="faqQuestion"><tmpl_var title></span></a></li>
-	</tmpl_loop>
-</ul>
-
-<tmpl_loop post_loop>
-	<tmpl_if user.isPoster>
-		<tmpl_unless session.var.adminOn>
-			<div>[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]</div>
-		</tmpl_unless>
-	</tmpl_if>
-	<tmpl_if user.isModerator>
-		<div>
-			<tmpl_if session.var.adminOn>
-				<tmpl_var controls>
-			<tmpl_else>
-				<tmpl_unless user.isPoster>
-					<tmpl_unless session.var.adminOn>
-						[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
-					</tmpl_unless>
-				</tmpl_unless>
-			</tmpl_if>
-			(<a href="<tmpl_var url>"><tmpl_var status></a>)
-		</div>
-	</tmpl_if>
-	<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a><span class="faqQuestion"><tmpl_var title></span><br />
-	<tmpl_var content>
-	<p><a href="#id<tmpl_var collaborationAssetId>">[top]</a></p>
-</tmpl_loop>
-
-<tmpl_if pagination.pageCount.isMultiple>
-	<div class="pagination">
-		<tmpl_var pagination.previousPage>  &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
-	</div>
-</tmpl_if>
diff --git a/docs/upgrades/templates-7.3.9/PBtmpl0000000000000142.tmpl b/docs/upgrades/templates-7.3.9/PBtmpl0000000000000142.tmpl
deleted file mode 100644
index 3e9db552e..000000000
--- a/docs/upgrades/templates-7.3.9/PBtmpl0000000000000142.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-#PBtmpl0000000000000142
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0">
-<channel>
-<title><tmpl_var title></title>
-<link><tmpl_var link></link>
-<description><tmpl_var description></description>
-<tmpl_loop item_loop>
-<item>
-<title><tmpl_var title></title>
-<link><tmpl_var link></link>
-<description><tmpl_var description></description>
-<guid isPermaLink="true"><tmpl_var guid></guid>
-<pubDate><tmpl_var pubDate></pubDate>
-</item>
-</tmpl_loop>
-</channel>
-</rss>
diff --git a/docs/upgrades/templates-7.3.9/ProjectManagerTMPL0004.tmpl b/docs/upgrades/templates-7.3.9/ProjectManagerTMPL0004.tmpl
deleted file mode 100644
index bd807e165..000000000
--- a/docs/upgrades/templates-7.3.9/ProjectManagerTMPL0004.tmpl
+++ /dev/null
@@ -1,91 +0,0 @@
-#ProjectManagerTMPL0004
-
-<tmpl_var form.header><tmpl_var form.seqNum>
-<table class="popUp" cellspacing="0" cellpadding="3" border="0">
-<tbody>
-<tr>
-        <td align="right" style="width:25%;" class="header"><tmpl_var task_name_label>&nbsp;</td>
-        <td style="width:75%;"><tmpl_var form.name></td>
-</tr>
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clear">
-                        <td style="width:25%;" align="right" class="header"><tmpl_var task_start_label>&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.start></td>
-                        <td style="width:25%;" align="right" class="header"><tmpl_var task_finish_label>&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.end></td>
-                </tr><tr class="clear">
-			<td style="width:100%; text-align: center" colspan="4" class="header"><tmpl_var form.taskType></td>
-		</tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clear">
-                        <td style="width:25%; text-align:right" class="header"><tmpl_var task_duration_label>&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.duration>&nbsp;<tmpl_var form.duration.units></td>
-                        <td style="width:25%; text-align:right" class="header"><tmpl_var task_lagTime_label> &nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.lagTime>&nbsp;<tmpl_var form.lagTime.units></td>
-                </tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clear">
-                        <td style="width:25%;" align="right" class="header"><tmpl_var task_predecessor_label>&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.dependants></td>
-                        <td style="width:25%;" align="right" class="header"><tmpl_var task_complete_label>&nbsp;</td>
-                        <td style="width:25%;"><tmpl_var form.percentComplete></td>
-                </tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-
-<tr>
-        <td colspan="2">
-                <table width="100%" cellpadding="3" cellspacing="0">
-                <tbody>
-                <tr class="clearNoBG" style="text-align:center;">
-                        <td style="text-align:left;">
-                           <span class="header"><tmpl_var task_resource_label>:</span><br /><br />
-                           <span style="margin-bottom:2px;padding-bottom:2px;padding-left:5px;-moz-box-sizing:border-box;display:block;">
-                              <a style="text-decoration:none;" id="<tmpl_var form.addUser.id>" href="<tmpl_var form.addUser.link>" target="_new" onclick="taskEdit_searchPopup(this.href); return false;"><img style="border-style:none;vertical-align:middle;" title="<tmpl_var form.addUser.text>" alt="<tmpl_var form.addUser.text>" src="<tmpl_var assetExtras>/users.gif" /><span style="text-decoration:none;font-size:8pt;"> <tmpl_var form.addUser.text></span></a>&nbsp;&nbsp;&nbsp;&nbsp;
-                              <a style="text-decoration:none;" id="<tmpl_var form.addGroup.id>" href="<tmpl_var form.addGroup.link>" target="_new" onclick="taskEdit_searchPopup(this.href); return false;"><img style="border-style:none;vertical-align:middle;" title="<tmpl_var form.addGroup.text>" alt="<tmpl_var form.addGroup.text>" src="<tmpl_var assetExtras>/groups.gif" /><span style="text-decoration:none;font-size:8pt;"> <tmpl_var form.addGroup.text></span></a>
-                           </span><tmpl_var form.resourceDiv>
-                        </td>
-                </tr>
-                <tr>
-                        <td style="text-align:right;" class="header"><a href="javascript:void(checkEditTaskForm(document.editTaskForm))" class="saveBtn"><tmpl_var task_save_label></a></td>
-                </tr>
-                </tbody>
-                </table>
-        </td>
-</tr>
-
-
-</tbody>
-</table>
-<tmpl_var form.footer>
-
-~~~
-
-<style type="text/css">
-.PM_small {
-	font-size:8pt;
-}
-tr.clearNoBG a {
-	text-decoration:none;
-	color:navy;
-}
-</style>
diff --git a/docs/upgrades/templates-7.3.9/SQLReport-Download.tmpl b/docs/upgrades/templates-7.3.9/SQLReport-Download.tmpl
deleted file mode 100644
index 4085c8e78..000000000
--- a/docs/upgrades/templates-7.3.9/SQLReport-Download.tmpl
+++ /dev/null
@@ -1,130 +0,0 @@
-#SQLReportDownload0001
-#namespace:SQLReport/Download
-#title:SQLReport Download Default Template
-#create
-<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-<tr>
-<tmpl_loop columns_loop>
-	<td class="tableHeader"><tmpl_var column.name></td>
-</tmpl_loop>
-</tr>
-<tmpl_loop rows_loop>
-	<tr>
-	<tmpl_loop row.field_loop>
-		<td class="tableData"><tmpl_var field.value></td>
-	</tmpl_loop>
-	</tr>
-	<!-- Handle nested query2 -->
-	<tmpl_if hasNest>
-		<tr>
-		<td colspan="<tmpl_var columns.count>">
-		<table width="100%" cellspacing="0" cellpadding="0">
-		<tr>
-		<td width="20">&nbsp;</td>
-		<td>
-		<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-		<tr>
-		<tmpl_loop query2.columns_loop>
-			<td class="tableHeader"><tmpl_var column.name></td>
-		</tmpl_loop>
-		</tr>
-		<tmpl_loop query2.rows_loop>
-			<tr>
-			<tmpl_loop query2.row.field_loop>
-				<td class="tableData"><tmpl_var field.value></td>
-			</tmpl_loop>
-			</tr>
-			<!-- Handle nested query3 -->
-			<tmpl_if query2.hasNest>
-				<tr>
-				<td colspan="<tmpl_var query2.columns.count>">
-				<table width="100%" cellspacing="0" cellpadding="0">
-				<tr>
-				<td style="width:20px;">&nbsp;</td>
-				<td>
-				<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-				<tr>
-				<tmpl_loop query3.columns_loop>
-					<td class="tableHeader"><tmpl_var column.name></td>
-				</tmpl_loop>
-				</tr>
-				<tmpl_loop query3.rows_loop>
-					<tr>
-					<tmpl_loop query3.row.field_loop>
-						<td class="tableData"><tmpl_var field.value></td>
-					</tmpl_loop>
-					</tr>
-		   			<!-- Handle nested query4 -->
-					<tmpl_if query3.hasNest>
-						<tr>
-						<td colspan="<tmpl_var query3.columns.count>">
-						<table width="100%" cellspacing="0" cellpadding="0">
-						<tr>
-						<td style="width:20px;">&nbsp;</td>
-						<td>
-						<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-						<tr>
-						<tmpl_loop query4.columns_loop>
-							<td class="tableHeader"><tmpl_var column.name></td>
-						</tmpl_loop>
-						</tr>
-						<tmpl_loop query4.rows_loop>
-							<tr>
-							<tmpl_loop query4.row.field_loop>
-								<td class="tableData"><tmpl_var field.value></td>
-							</tmpl_loop>
-				   			<!-- Handle nested query5 -->
-							<tmpl_if query4.hasNest>
-								<tr>
-								<td colspan="<tmpl_var query4.columns.count>">
-								<table width="100%" cellspacing="0" cellpadding="0">
-								<tr>
-								<td style="width:20px;">&nbsp;</td>
-								<td>
-								<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
-								<tr>
-								<tmpl_loop query5.columns_loop>
-									<td class="tableHeader"><tmpl_var column.name></td>
-								</tmpl_loop>
-								</tr>
-								<tmpl_loop query5.rows_loop>
-									<tr>
-									<tmpl_loop query5.row.field_loop>
-										<td class="tableData"><tmpl_var field.value></td>
-									</tmpl_loop>
-									</tr>
-								</tmpl_loop>
-								</table>
-								</td>
-								</tr>
-								</table>
-						        	</td>
-				        			</tr>
-							</tmpl_if>
-							</tr>
-						</tmpl_loop>
-						</table>
-						</td>
-						</tr>
-						</table>
-				        	</td>
-				        	</tr>
-					</tmpl_if>
-				</tmpl_loop>
-				</table>
-				</td>
-				</tr>
-				</table>
-			        </td>
-			        </tr>
-			</tmpl_if>
-		</tmpl_loop>
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-	</tmpl_if>
-</tmpl_loop>
-</table>
diff --git a/docs/upgrades/templates-7.3.9/calendarEventDetails.tmpl b/docs/upgrades/templates-7.3.9/calendarEventDetails.tmpl
deleted file mode 100644
index ae10b581a..000000000
--- a/docs/upgrades/templates-7.3.9/calendarEventDetails.tmpl
+++ /dev/null
@@ -1,208 +0,0 @@
-#CalendarEvent000000001
-<table cellspacing="0" cellpadding="0" width="600" id="mCAL" border="0">
-<tr>
-    <td style="text-align:right;border-bottom:solid white 1px;">
-        <a href="<tmpl_var urlDay>" class="tab">Day</a>
-        <a href="<tmpl_var urlWeek>" class="tab">Week</a>
-        <a href="<tmpl_var urlMonth>" class="tab">Month</a>
-        <a href="<tmpl_var urlSearch>" class="tab">Search</a>
-        
-        <div class="controls">
-            <a href="?func=edit">Edit</a> 
-            &bull; <a href="?func=delete">Delete</a> 
-            &bull; <a href="?print=1">Print</a>
-        </div>
-    </td>
-</tr>
-<tr>
-    <td class="months">
-        <div style="float: left;"><a href="<tmpl_var prevUrl>">&lt;&lt; Previous Event</a></div>
-        <div style="float: right;"><a href="<tmpl_var nextUrl>">Next Event &gt;&gt;</a></div>
-    </td>
-</tr>
-<tr>
-    <td class="months">
-        Event Details
-    </td>
-</tr>
-<tr>
-    <td style="width:100%">
-        <table width="100%" cellspacing="2" cellpadding="0">
-        <tr>
-            <td class="heading">
-                <div style="padding:4px;">Event Title</div>
-            </td>
-            <td class="day">    
-                <div class="eventWrapper">
-                    <tmpl_var title>
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td class="heading">
-                <div style="padding:4px;">Location</div>
-            </td>
-            <td class="day">    
-                <div class="eventWrapper">
-                    <tmpl_var location>
-                </div>
-            </td>
-        </tr>
-        
-        <tr>
-            <td class="heading">
-                <div style="padding:4px;">Description</div>
-            </td>
-            <td class="day">                            
-                <div class="eventWrapper"><tmpl_var description></div>
-            </td>
-        </tr>
-
-        <tr>
-            <td class="heading">
-                <div style="padding:4px;">Scheduled</div>
-            </td>
-            <td class="day">                            
-                <div class="eventWrapper">
-                    <tmpl_var dateSpan>
-                </div>
-            </td>
-        </tr>
-
-        <tr>
-            <td class="heading">
-                <div style="padding:4px;">Related Material</div>
-            </td>
-            <td class="day">                                <div class="eventWrapper"><tmpl_loop relatedLinks>
-                <a href="<tmpl_var link.url>"><tmpl_var linkUrl></a><br />
-                </tmpl_loop></div>
-            </td>
-        </tr>
-    
-        </table>
-    </td>
-</tr>
-</table>
-~~~
-	<style type="text/css">
-		/* Edited with EditCSS */
-
-/**** Inline STYLE-tag style sheet ****/
-
-		body * {
-			margin:0px;
-		}	
-		#mCAL {
-			
-		}
-		#mCAL td {
-			font-size:10px;
-			font-family:arial;
-		}
-		#mCAL .tab {
-
-			border-bottom-style:none;
-			font-weight:bold;
-			padding: 2px 15px 0px 15px;
-			text-align;center;
-			background-color:#E9ECF3;
-			-moz-border-radius-topLeft:10px;
-			-moz-border-radius-topRight:10px;
-			color:#7588B5;
-			text-decoration:none;
-			font-size:10pt;
-			display:block;
-			float:left;
-			margin-right:5px;
-		}
-		#mCAL .tab:hover {
-			color:black;
-		}	
-		#mCAL .active {
-			background-color:#DFE3EE;
-			color:#404F77;
-			border-bottom:solid #DFE3EE 1px;
-		}	
-		#mCAL a {
-			font-size:11px;
-			color:#517AC8;
-		}	
-		#mCAL .heading {
-			width:200px;
-			-moz-box-sizing:border-box;
-			background-color:#ABB7D1;
-			text-align:center;
-			font-weight:bold;
-			color:#374664;
-			font-size:9px;
-			letter-spacing:1px;
-			text-transform:uppercase;
-			text-align:right;
-			vertical-align:top;
-			-moz-border-radius-bottomRight:8px;
-			-moz-border-radius-topRight:8px;			
-		}
-		#mCAL .day {
-			background-color:#E9ECF3;			
-			width:400px;
-			position:relative;
-			vertical-align:top;		
-			-moz-border-radius-topLeft:8px;
-			-moz-border-radius-bottomLeft:8px;			
-			border:solid #CCD2E3 1px;
-		}
-
-		
-		#mCAL .months {
-			text-align:center;
-			background-color:#DFE3EE;	
-			color:#3E4D75;
-			font-size:14px;
-			font-weight:bold;
-		}
-		#mCAL .months a {
-			color:#517AC8;
-			text-decoration:none;
-		}
-		#mCAL .months .monthLink {
-			text-decoration:none;			
-			padding-left:5px;
-			padding-right:5px;
-			color:#AAB8D5;
-			font-size:12px;
-			font-weight:bold;
-		}	
-		#mCAL .months .current {
-			color:#517AC8;
-		}
-		#mCAL .current {
-			font-weight:bold;
-			color:#517AC8;
-			background-color:#fff;			
-			-moz-border-radius:5px;
-		}
-		#mCAL .curMonth {
-			text-align:center;
-			margin: 2px 0px;
-			background-color:#517AC8;
-			color:white;
-			font-size:14px;
-			font-weight:bold;
-		}
-
-		#mCAL .searchField {
-			margin: 2px 10px;
-			border:solid #ABB7D1 1px;
-		}
-		#mCAL .searchBtn {
-			background-color: #ABB7D1;
-			border:solid #CCD2E3 1px;
-			color:white;
-			font-weight:bold;
-			cursor:pointer;
-		}
-		
-		#mCAL .eventWrapper {
-			margin:2px 10px;
-		}
-	</style>
diff --git a/docs/upgrades/upgrade_6.8.10-6.99.0.pl b/docs/upgrades/upgrade_6.8.10-6.99.0.pl
deleted file mode 100644
index 112b5edd3..000000000
--- a/docs/upgrades/upgrade_6.8.10-6.99.0.pl
+++ /dev/null
@@ -1,1322 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
- 
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::VersionTag;
-use File::Path;
-use WebGUI::Workflow;
-use WebGUI::Workflow::Cron;
-use WebGUI::Group;
-use WebGUI::Utility;
-use WebGUI::Storage;
-
-my $toVersion = "6.99.0"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-changeDbCacheTimeoutName();
-addWorkflow();
-addSearchEngine();
-convertMessageLogToInbox();
-updateCs();
-changeCache();
-templateParsers();
-removeFiles();
-addEMS();
-addPM();
-addTT();
-updateTemplates();
-updateDatabaseLinksAndSQLReport();
-ipsToCIDR();
-addDisabletoRichEditor();
-addNavigationMimeType();
-addIndexes();
-addDatabaseCache();
-fixImportNodePrivileges();
-addAdManager();
-updateMatrix();
-updateFolder();
-addRichEditUpload();
-updateArticle();
-updateScratch();
-updateProfileListFields();
-installSQLForm();
-addResizableTextareas();
-addScratchKeys();
-addGraphing();
-dropShortcutDescription();
-
-finish($session); # this line required
-
-#-------------------------------------------------
-sub addResizableTextareas {
-	print "\tAllowing user to resize text areas on the fly.\n";
-	$session->setting->remove("textAreaCols");
-	$session->setting->remove("textAreaRows");
-}
-
-#-------------------------------------------------
-sub dropShortcutDescription {
-	print "\tRemoving unused description column from Shortcut.  Unused since Dashboard was added.\n";
-	$session->db->write("ALTER TABLE Shortcut DROP COLUMN description;");
-}
-
-#-------------------------------------------------
-sub updateScratch {
-	print "\tIncreasing size of scratch variables.\n";
-	$session->db->write("alter table userSessionScratch change value value text");
-}
-
-#-------------------------------------------------
-sub updateArticle {
-	print "\tAllowing articles to have direct attachments.\n";
-	$session->db->write("alter table Article add column storageId varchar(22) binary");
-	my $rs = $session->db->read("select assetId from asset where className='WebGUI::Asset::Wobject::Article'");
-	while (my ($id) = $rs->array) {
-		my $asset = WebGUI::Asset->new($session, $id, "WebGUI::Asset::Wobject::Article");
-		if (defined $asset) {
-			my $children = $asset->getLineage(["children"],{returnObjects=>1, includeOnlyClasses=>["WebGUI::Asset::File","WebGUI::Asset::File::Image"]});
-			if (scalar(@{$children})) {
-				my $storage = undef;
-				if ($asset->get("storageId")) {
-					$storage = WebGUI::Storage->get($session,$asset->get("storageId"));
-				} else {
-					$storage = WebGUI::Storage->create($session);
-					$asset->update({storageId=>$storage->getId});
-				}
-				foreach my $child (@{$children}) {
-					$child->getStorageLocation->copy($storage);
-					$child->purge({skipExported=>1});
-				}
-			}
-			if ($asset->get("convertCarriageReturns")) {
-				my $description = $asset->get("description");
-				$description =~ s/\n/\<br \/\>\n/g;
-				$asset->update({description=>$description});
-			}
-		}
-	}
-	$session->db->write("alter table Article drop column convertCarriageReturns");
-}
-
-#-------------------------------------------------
-sub addRichEditUpload {
-	print "\tAdding the ability to upload from the rich editor.\n";
-	my $root = WebGUI::Asset->getRoot($session);
-	my $media = $root->addChild({
-		url=>"media",
-		title=>"Media",
-		menuTitle=>"Media",
-		className=>"WebGUI::Asset::Wobject::Folder",
-		styleTemplateId=>"PBtmpl0000000000000060",
-		printableStyleTemplateId=>'PBtmpl0000000000000111',
-		templateId=>'PBtmpl0000000000000078',
-		ownerUserId=>'3',
-		groupIdEdit=>'12',
-		groupIdView=>'7',
-		},"PBasset000000000000003");
-	$session->db->write("update asset set isSystem=1 where assetId=?",[$media->getId]);
-	# somehow the import node isn't protected, doing that now
-	$session->db->write("update asset set isSystem=1 where assetId=?",['PBasset000000000000002']);
-	# the failsafe style should be visible
-	$session->db->write("update template set showInForms=1 where assetId=?",['PBtmpl0000000000000060']);
-}
-
-#-------------------------------------------------
-sub updateFolder {
-	print "\tAdding sort option to folder.\n";
-	$session->db->write("alter table Folder add column sortAlphabetically int not null default 0");
-}
-
-#-------------------------------------------------
-sub updateMatrix {
-	print "\tAdding new features to the matrix.\n";
-	$session->db->write("alter table Matrix_listing add column storageId varchar(22) binary");
-	$session->db->write("alter table Matrix_listing add column filename varchar(255)");
-}
-
-#-------------------------------------------------
-sub changeCache {
-	print "\tChanging page cache system.\n";
-	$session->db->write("alter table MessageBoard add column visitorCacheTimeout int not null default 3600");
-	$session->db->write("alter table Matrix add column visitorCacheTimeout int not null default 3600");
-	$session->db->write("alter table Collaboration add column visitorCacheTimeout int not null default 3600");
-	$session->db->write("alter table EventsCalendar add column visitorCacheTimeout int not null default 3600");
-	$session->db->write("alter table Folder add column visitorCacheTimeout int not null default 3600");
-	$session->db->write("alter table HttpProxy add column cacheTimeout int not null default 0");
-	$session->db->write("alter table SQLReport add column cacheTimeout int not null default 0");
-	$session->db->write("alter table snippet add column cacheTimeout int not null default 3600");
-	$session->db->write("alter table FileAsset add column cacheTimeout int not null default 3600");
-	$session->db->write("alter table Product add column cacheTimeout int not null default 3600");
-	$session->db->write("alter table SyndicatedContent add column cacheTimeout int not null default 3600");
-	$session->db->write("alter table MultiSearch add column cacheTimeout int not null default 3600");
-	$session->db->write("alter table Article add column cacheTimeout int not null default 3600");
-	$session->db->write("alter table wobject drop column cacheTimeout");
-	$session->db->write("alter table wobject drop column cacheTimeoutVisitor");
-}
-
-#-------------------------------------------------
-sub addAdManager {
-	print "\tAdding advertising management.\n";
-	$session->db->write("create table adSpace (
-		adSpaceId varchar(22) binary not null primary key,
-		name varchar(35) not null unique key,
-		title varchar(255) not null,
-		description text,
-		costPerImpression decimal(11,2) not null default 0,
-		minimumImpressions int not null default 1000,
-		costPerClick decimal(11,2) not null default 0,
-		minimumClicks int not null default 1000,
-		width int not null default 468,
-		height int not null default 60,
-		groupToPurchase varchar(22) binary not null default '3'
-		)");
-	$session->db->write("create table advertisement (
-		adId varchar(22) binary not null primary key,
-		adSpaceId varchar(22) binary not null,
-		ownerUserId varchar(22) binary not null,
-		isActive int not null default 0,
-		title varchar(255) not null,
-		type varchar(15) not null default 'text',
-		storageId varchar(22) binary,
-		adText varchar(255),
-		url text,
-		richMedia text,
-		borderColor varchar(7) not null default '#000000',
-		textColor varchar(7) not null default '#000000',
-		backgroundColor varchar(7) not null default '#ffffff',
-		clicks int not null default 0,
-		clicksBought int not null default 0,
-		impressions int not null default 0,
-		impressionsBought int not null default 0,
-		priority int not null default 0,
-		nextInPriority bigint not null default 0,
-		renderedAd text
-		)");
-	$session->db->write("alter table advertisement add index adSpaceId_isActive (adSpaceId, isActive)");
-	my $macros = $session->config->addToHash("macros","AdSpace","AdSpace");
-	my $group = WebGUI::Group->new($session, "new", "pbgroup000000000000017");
-	$group->name("Ad Manager");
-	$group->description("These users will be able to manage advertisements.");
-}
-
-#-------------------------------------------------
-sub fixImportNodePrivileges {
-	print "\tFixing the privileges of all the content in the import node.\n";
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	$importNode->update({groupIdView=>'7', groupIdEdit=>'12'});
-	my $prepared = $session->db->prepare("update assetData set groupIdView='7', groupIdEdit='12' where assetId=?");
-	my $rs = $session->db->read("select assetId from asset where lineage like ?",[$importNode->get("lineage").'%']);
-	while (my ($id) = $rs->array) {
-		$prepared->execute([$id]);	
-	}
-	my $root = WebGUI::Asset->getRoot($session);
-	$root->update({groupIdView=>'7'});
-}
-
-#-------------------------------------------------
-sub convertMessageLogToInbox {
-	print "\tConverting message log to inbox.\n";
-	$session->db->write("create table inbox (
-		messageId varchar(22) binary not null primary key,
-		status varchar(15) not null default 'pending',
-		dateStamp bigint not null,
-		completedOn bigint,
-		completedBy varchar(22) binary,
-		userId varchar(22) binary,
-		groupId varchar(22) binary,
-		subject varchar(255) not null default 'No Subject',
-		message mediumtext
-		)");	
-	$session->db->write("alter table Matrix_listing add column approvalMessageId varchar(22) binary");
-# not migrating cuz it's not useful, but leaving this code here in case someone decides they need the data migrated
-#	my $prepared = $session->db->prepare("insert into inbox (messageId, status, dateStamp, completedOn, completedBy, userId, subject, message) 
-#		values ( ?,?,?,?,?,?,?,? )");
-#	my $rs = $session->db->read("select * from messageLog");
-#	while (my $data = $rs->hashRef) {
-#		$prepared->execute([
-#			$session->id->generate,
-#			'completed',
-#			$data->{dateOfEntry},
-#			time(),
-#			'3',
-#			$data->{userId},
-#			$data->{subject} || "No Subject",
-#			$data->{message}
-#			]);	
-#	}
-	$session->db->write("delete from userProfileField where fieldname='INBOXNotifications'");
-	$session->db->write("delete from userProfileData where fieldname='INBOXNotifications'");
-	$session->db->write("drop table if exists messageLog");
-	my $rs = $session->db->read("select distinct assetId from template where namespace='Operation/MessageLog/View' or namespace='Operation/MessageLog/Message'");
-	while (my ($id) = $rs->array) {
-		my $asset = WebGUI::Asset->new($session, $id, "WebGUI::Asset::Template");
-		if (defined $asset) {
-			$asset->purge({skipExported=>1});
-		}
-	}
-}
-
-#-------------------------------------------------
-sub updateCs {
-	print "\tUpdating the Collaboration System.\n";
-	print "\t\tAdding collaboration system popularity system based upon karma.\n";
-	$session->db->write("alter table Collaboration add column defaultKarmaScale integer not null default 1");
-	$session->db->write("alter table Thread add column karma integer not null default 0");
-	$session->db->write("alter table Thread add column karmaScale integer not null default 1");
-	$session->db->write("alter table Thread add column karmaRank decimal(6,6) not null default 0");
-	print "\t\tIncreasing CS performance.\n";
-	$session->db->write("alter table Post_rating add index assetId_userId (assetId,userId);");
-	$session->db->write("alter table Post_rating add index assetId_ipAddress (assetId,ipAddress);");
-	$session->db->write("delete from Post_read where postId<>threadId");
-	$session->db->write("alter table Post_read drop column postId");
-	$session->db->write("alter table Post_read drop column readDate");
-	$session->db->write("alter table Post_read rename Thread_read");
-	print "\t\tAdding email to discussion support.\n";
-	$session->db->write("alter table Collaboration add column mailServer varchar(255)");
-	$session->db->write("alter table Collaboration add column mailAccount varchar(255)");
-	$session->db->write("alter table Collaboration add column mailPassword varchar(255)");
-	$session->db->write("alter table Collaboration add column mailAddress varchar(255)");
-	$session->db->write("alter table Collaboration add column mailPrefix varchar(255)");
-	$session->db->write("alter table Collaboration add column getMail int not null default 0");
-	$session->db->write("alter table Collaboration add column getMailInterval int not null default 300");
-	$session->db->write("alter table Collaboration add column getMailCronId varchar(22) binary");
-	my $workflow = WebGUI::Workflow->create($session, {
-			isSingleton=>1,
-			type=>"WebGUI::Asset::Wobject::Collaboration",	
-			enabled=>1,
-			description=>"Retrieves mail from a POP3 account for the given Collaboration System.",
-			title=>"Get CS Mail"	
-			}, "csworkflow000000000001");
-	my $activity = $workflow->addActivity("WebGUI::Workflow::Activity::GetCsMail","csactivity000000000001");
-	$activity->set("title","Get the mail");	
-	print "\t\tDeleting old ratings due to new rating system.\n";
-	$session->db->write("delete from Post_rating");
-	$session->db->write("update Post set rating=0");
-}
-
-#-------------------------------------------------
-sub addDatabaseCache {
-	print "\tAdding database cache.\n";
-	$session->db->write("create table cache ( namespace varchar(128) not null, cachekey varchar(128) not null, expires bigint not null, size int not null, content mediumtext, primary key (namespace, cachekey))");
-	$session->db->write("alter table cache add index namespace_cachekey_size (namespace,cachekey,expires)");
-	if ($session->config->get("memcached_servers")) {
-		$session->config->set("cacheType","WebGUI::Cache::Memcached");
-	} else {
-		$session->config->set("cacheType","WebGUI::Cache::FileCache");
-	}
-}
-
-#-------------------------------------------------
-sub addIndexes {
-	print "\tAdding indexes to increase performance.\n";
-	$session->db->write("alter table assetData add index url (url)");
-}
-
-#-------------------------------------------------
-sub addWorkflow {
-	print "\tAdding workflow.\n";
-	print "\t\tMaking database changes.\n";
-	$session->db->write("alter table assetData drop column startDate");
-	$session->db->write("alter table assetData drop column endDate");
-	$session->db->write("alter table assetVersionTag add column isLocked int not null default 0");
-	$session->db->write("alter table assetVersionTag add column lockedBy varchar(22) binary not null");
-	$session->db->write("alter table assetVersionTag add column groupToUse varchar(22) binary not null");
-	$session->db->write("alter table assetVersionTag add column workflowId varchar(22) binary not null");
-	$session->db->write("alter table assetVersionTag add column workflowInstanceId varchar(22) binary");
-	$session->db->write("alter table assetVersionTag add column comments text");
-	$session->db->write("create table WorkflowSchedule (
-		taskId varchar(22) binary not null primary key,
-		title varchar(255) not null default 'Untitled',
-		enabled int not null default 0,
-		runOnce int not null default 0,
-		minuteOfHour varchar(25) not null default '0',
-		hourOfDay varchar(25) not null default '*',
-		dayOfMonth varchar(25) not null default '*',
-		monthOfYear varchar(25) not null default '*',
-		dayOfWeek varchar(25) not null default '*',
-		workflowId varchar(22) binary not null,
-		className varchar(255),
-		methodName varchar(255),
-		priority int not null default 2,
-		parameters text
-		)");
-	$session->db->write("create table WorkflowInstance (
-		instanceId varchar(22) binary not null primary key,
-		workflowId varchar(22) binary not null,
-		currentActivityId varchar(22) binary not null,
-		priority int not null default 2,
-		className varchar(255),
-		methodName varchar(255),
-		parameters text,
-		runningSince bigint,
-		lastUpdate bigint,
-		lastStatus varchar(15)
-		)");
-	$session->db->write("create table WorkflowInstanceScratch (
-		instanceId varchar(22) binary not null,
-		name varchar(255) not null,
-		value text,
-		primary key (instanceId, name)
-		)");
-	$session->db->write("create table Workflow (
-		workflowId varchar(22) binary not null primary key,
-		title varchar(255) not null default 'Untitled',
-		description text,
-		enabled int not null default 0,
-		isSerial int not null default 0,
-		isSingleton int not null default 0,
-		type varchar(255) not null default 'None'
-		)");
-	$session->db->write("create table WorkflowActivity (
-		activityId varchar(22) binary not null primary key,
-		workflowId varchar(22) binary not null,
-		title varchar(255) not null default 'Untitled',
-		description text,
-		sequenceNumber int not null default 1,
-		className varchar(255)
-		)");
-	$session->db->write("create table WorkflowActivityData (
-		activityId varchar(22) binary not null,
-		name varchar(255) not null,
-		value text,
-		primary key (activityId, name)
-		)");
-	$session->db->write("create table mailQueue (
-		messageId varchar(22) binary not null primary key,
-		message mediumtext,
-		toGroup varchar(22) binary
-		)");
-	$session->db->write("alter table Collaboration drop column moderatePosts");
-	$session->db->write("alter table Collaboration drop column moderateGroupId");
-	$session->db->write("alter table Collaboration add column approvalWorkflow varchar(22) binary not null default 'pbworkflow000000000003'");
-	print "\t\tPurging old workflow info.\n";
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	my $rs = $session->db->read("select assetId from assetData where status='denied'");
-	while (my ($id) = $rs->array) {
-		my $asset = WebGUI::Asset->newByDynamicClass($session, $id);
-		if (defined $asset && $asset->get("status") eq "denied") {
-			$asset->purge({skipExported=>1});
-		}
-	}
-	$session->db->write("update assetData set status='approved' where status='denied'");
-	print "\t\tUpdating groups.\n";
-	$session->db->write("update groups set showInForms=1 where groupId='12'");
-	my $group = WebGUI::Group->new($session,"new","pbgroup000000000000015");
-	$group->set("groupName", "Workflow Managers");
-	$group->set("description", "People who can create, edit, and delete workflows.");
-	$group = WebGUI::Group->new($session,"new","pbgroup000000000000016");
-	$group->set("groupName", "Version Tag Managers");
-	$group->set("description", "People who can create, edit, and delete special version tags.");
-	print "\t\tUpdating the config file.\n";
-	$session->config->set("spectreIp","127.0.0.1");
-	$session->config->set("spectrePort",32133);
-	$session->config->set("spectreSubnets",["127.0.0.1/32"]);
-	$session->config->set("workflowActivities", {
-		None=>["WebGUI::Workflow::Activity::DecayKarma", "WebGUI::Workflow::Activity::TrashClipboard", "WebGUI::Workflow::Activity::CleanTempStorage", 
-			"WebGUI::Workflow::Activity::CleanFileCache", "WebGUI::Workflow::Activity::CleanLoginHistory", "WebGUI::Workflow::Activity::ArchiveOldThreads",
-			"WebGUI::Workflow::Activity::TrashExpiredEvents", "WebGUI::Workflow::Activity::CreateCronJob", "WebGUI::Workflow::Activity::DeleteExpiredSessions",
-			"WebGUI::Workflow::Activity::ExpireGroupings", "WebGUI::Workflow::Activity::PurgeOldAssetRevisions",
-			"WebGUI::Workflow::Activity::ExpireSubscriptionCodes", "WebGUI::Workflow::Activity::PurgeOldTrash", 
-			"WebGUI::Workflow::Activity::GetSyndicatedContent", "WebGUI::Workflow::Activity::ProcessRecurringPayments",
-			"WebGUI::Workflow::Activity::SendQueuedMailMessages", "WebGUI::Workflow::Activity::CleanDatabaseCache",
-			"WebGUI::Workflow::Activity::SyncProfilesToLdap", "WebGUI::Workflow::Activity::SummarizePassiveProfileLog"],
-		"WebGUI::User"=>["WebGUI::Workflow::Activity::CreateCronJob", "WebGUI::Workflow::Activity::NotifyAboutUser"],
-		"WebGUI::VersionTag"=>["WebGUI::Workflow::Activity::CommitVersionTag", "WebGUI::Workflow::Activity::RollbackVersionTag", 
-			"WebGUI::Workflow::Activity::TrashVersionTag", "WebGUI::Workflow::Activity::CreateCronJob", "WebGUI::Workflow::Activity::UnlockVersionTag",
-			"WebGUI::Workflow::Activity::RequestApprovalForVersionTag", "WebGUI::Workflow::Activity::NotifyAboutVersionTag",
-			"WebGUI::Workflow::Activity::ExportVersionTagAsHtml"]
-		});
-	$session->config->delete("SyncProfilesToLDAP_hour");
-	$session->config->delete("fileCacheSizeLimit");
-	$session->config->delete("passiveProfileInterval");
-	$session->config->delete("CleanLoginHistory_ageToDelete");
-	$session->config->delete("DecayKarma_minimumKarma");
-	$session->config->delete("DecayKarma_decayFactor");
-	$session->config->delete("DeleteExpiredClipboard_offset");
-	$session->config->delete("DeleteExpiredEvents_offset");
-	$session->config->delete("TrashExpiredContent_offset");
-	$session->config->delete("DeleteExpiredTrash_offset");
-	$session->config->delete("DeleteExpiredRevisions_offset");
-	print "\t\tAdding default workflows and cron jobs.\n";
-	my $workflow = WebGUI::Workflow->create($session, {
-		title=>"Daily Maintenance Tasks",
-		description=>"This workflow runs daily maintenance tasks such as cleaning up old temporary files and cache.",
-		enabled=>1,
-		type=>"None"
-		}, "pbworkflow000000000001");
-	my $activity = $workflow->addActivity("WebGUI::Workflow::Activity::CleanTempStorage", "pbwfactivity0000000001");
-	$activity->set("title","Delete temp files older than 24 hours");
-	$activity->set("storageTimeout",60*60*24);
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::ProcessRecurringPayments", "pbwfactivity0000000013");
-	$activity->set("title", "Process Recurring Payments");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::CleanFileCache", "pbwfactivity0000000002");
-	$activity->set("title","Prune file cache larger than 100MB");
-	$activity->set("sizeLimit", 1000000000);
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::CleanDatabaseCache", "pbwfactivity0000000022");
-	$activity->set("title","Prune database cache larger than 100MB");
-	$activity->set("sizeLimit", 1000000000);
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::ArchiveOldThreads", "pbwfactivity0000000005");
-	$activity->set("title", "Archive old CS threads");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::TrashExpiredEvents", "pbwfactivity0000000006");
-	$activity->set("title", "Trash old Events Calendar Events");
-	$activity->set("trashAfter", 60*60*24*30);
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::ExpireGroupings", "pbwfactivity0000000007");
-	$activity->set("title", "deal with user groupings that have expired");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::ExpireSubscriptionCodes", "pbwfactivity0000000011");
-	$activity->set("title", "Expire old subscription codes");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::SummarizePassiveProfileLog", "pbwfactivity0000000014");
-	$activity->set("title", "Summarize Passive Profiling Data");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::SyncProfilesToLdap", "pbwfactivity0000000015");
-	$activity->set("title", "Sync User Profiles With LDAP");
-	WebGUI::Workflow::Cron->create($session, {
-		title=>'Daily Maintenance',
-		enabled=>1,
-		runOnce=>0,
-		minuteOfHour=>"30",
-		hourOfDay=>"23",
-		priority=>3,
-		workflowId=>$workflow->getId
-		}, "pbcron0000000000000001");
-	$workflow = WebGUI::Workflow->create($session, {
-		title=>"Weekly Maintenance Tasks",
-		description=>"This workflow runs once per week to perform maintenance tasks like cleaning up log files.",
-		enabled=>1,
-		type=>"None"
-		}, "pbworkflow000000000002");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::CleanLoginHistory", "pbwfactivity0000000003");
-	$activity->set("title", "Delete login entries older than 90 days");
-	$activity->set("ageToDelete", 60*60*24*90);
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::TrashClipboard", "pbwfactivity0000000004");
-	$activity->set("title", "Move clipboard items older than 30 days to trash");
-	$activity->set("trashAfter", 60*60*24*30);
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::PurgeOldAssetRevisions", "pbwfactivity0000000008");
-	$activity->set("title", "delete asset revisions older than a year from the database");
-	$activity->set("purgeAfter", 60*60*24*365);
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::PurgeOldTrash", "pbwfactivity0000000010");
-	$activity->set("title", "delete assets from trash that have been sitting around for 30 days");
-	$activity->set("purgeAfter", 60*60*24*30);
-	WebGUI::Workflow::Cron->create($session, {
-                title=>'Weekly Maintenance',
-                enabled=>1,
-                runOnce=>0,
-                minuteOfHour=>"30",
-                hourOfDay=>"1",
-		dayOfWeek=>"0",
-                priority=>3,
-                workflowId=>$workflow->getId
-                }, "pbcron0000000000000002");
-	$workflow = WebGUI::Workflow->create($session, {
-		title=>"Hourly Maintenance Tasks",
-		description=>"This workflow runs once per hour to perform maintenance tasks like deleting expired user sessions.",
-		enabled=>1,
-		type=>"None"
-		}, "pbworkflow000000000004");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::DeleteExpiredSessions", "pbwfactivity0000000009");
-	$activity->set("title", "delete expired sessions");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::GetSyndicatedContent", "pbwfactivity0000000012");
-	$activity->set("title", "Get syndicated content");
-	WebGUI::Workflow::Cron->create($session, {
-                title=>'Hourly Maintenance',
-                enabled=>1,
-                runOnce=>0,
-                minuteOfHour=>"15",
-                priority=>3,
-                workflowId=>$workflow->getId
-                }, "pbcron0000000000000003");
-	$workflow = WebGUI::Workflow->create($session, {
-		title=>"Commit Without Approval",
-		description=>"This workflow commits all the assets in this version tag without asking for any approval.",
-		enabled=>1,
-		type=>"WebGUI::VersionTag"
-		}, "pbworkflow000000000003");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::CommitVersionTag", "pbwfactivity0000000006");
-	$activity->set("title", "Commit Assets");
-	$workflow = WebGUI::Workflow->create($session, {
-		title=>"Commit With Approval",
-		description=>"This workflow commits all the assets in this version tag after getting approval from content managers.",
-		enabled=>1,
-		type=>"WebGUI::VersionTag"
-		}, "pbworkflow000000000005");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::RequestApprovalForVersionTag", "pbwfactivity0000000017");
-	$activity->set("title", "Get Approval from Content Managers");
-	$activity->set("groupToApprove", "4");
-	$activity->set("message", "A new version tag awaits your approval.");
-	$activity->set("doOnDeny", "pbworkflow000000000006");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::CommitVersionTag", "pbwfactivity0000000016");
-	$activity->set("title", "Commit Assets");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::NotifyAboutVersionTag", "pbwfactivity0000000018");
-	$activity->set("title", "Notify Committer of Approval");
-	$activity->set("message", "Your version tag was approved.");
-	$activity->set("who", "committer");
-	$workflow = WebGUI::Workflow->create($session, {
-		title=>"Unlock Version Tag and Notify Owner",
-		description=>"This workflow is used when a version tag approval is denied. It unlocks the version tag, making it available for editing, and notifies the tag owner.",
-		enabled=>1,
-		type=>"WebGUI::VersionTag"
-		}, "pbworkflow000000000006");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::UnlockVersionTag", "pbwfactivity0000000019");
-	$activity->set("title", "Unlock Version Tag");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::NotifyAboutVersionTag", "pbwfactivity0000000020");
-	$activity->set("title", "Notify Committer of Denial");
-	$activity->set("message", "Your version tag was denied. Please take corrective actions and recommit your changes.");
-	$activity->set("who", "committer");
-	$workflow = WebGUI::Workflow->create($session, {
-		title=>"Send Queued Email Messages",
-		description => "Sends all the messages in the mail queue.",
-		enabled=>1,
-		isSingleton=>1,
-		type=>"None"
-		}, "pbworkflow000000000007");
-	$activity = $workflow->addActivity("WebGUI::Workflow::Activity::SendQueuedMailMessages", "pbwfactivity0000000021");
-	$activity->set("title", "Send Queued Messages");
-	WebGUI::Workflow::Cron->create($session, {
-                title=>'Send Queued Email Messages Every 5 Minutes',
-                enabled=>1,
-                runOnce=>0,
-                minuteOfHour=>"*/5",
-                priority=>3,
-                workflowId=>$workflow->getId
-                }, "pbcron0000000000000004");
-	print "\t\tUpdating settings.\n";
-	$session->setting->remove("autoCommit");
-	$session->setting->remove("alertOnNewUser");
-	$session->setting->remove("onNewUserAlertGroup");
-	$session->setting->set("runOnRegistration","");
-	$session->setting->add("defaultVersionTagWorkflow","pbworkflow000000000003");
-	$session->setting->add("mailReturnPath",undef);
-}
-
-#-------------------------------------------------
-sub updateDatabaseLinksAndSQLReport {
-	print "\tUpdating the Database link and SQLReport Tables.\n";
-	$session->db->write('alter table databaseLink add column allowedKeywords text');
-	$session->db->write('update databaseLink set allowedKeywords="select\ndecsribe\nshow"');
-	$session->db->write('alter table SQLReport add column prequeryStatements1 text');
-	$session->db->write('alter table SQLReport add column prequeryStatements2 text');
-	$session->db->write('alter table SQLReport add column prequeryStatements3 text');
-	$session->db->write('alter table SQLReport add column prequeryStatements4 text');
-	$session->db->write('alter table SQLReport add column prequeryStatements5 text');
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-        print "\tUpdating base templates for XHTML compliance, and a cleaner look.\n" unless ($quiet);
-	$session->config->deleteFromHash("macros","JavaScript");
-	$session->config->deleteFromHash("macros","RawHeadTags");
-	$session->config->deleteFromHash("macros","StyleSheet");
-	$session->db->write("alter table template add column headBlock text");
-	my $template = WebGUI::Asset->new($session, "PBtmpl0000000000000003", "WebGUI::Asset::Template");
-	if (defined $template) {
-		$template->purge({skipExported=>1});
-	}
-	opendir(DIR,"templates-6.99.0");
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $folder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => "7.0.0 New Templates",
-		menuTitle => "7.0.0 New Templates",
-		url=> "7_0_0_new_templates",
-		groupIdView=>"12"
-		});
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-6.99.0/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			#sleep(1);
-			my $template = $folder->addChild(\%properties, $properties{id});
-		} else {
-			#sleep(1);
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub addEMS {
-
-my $sql1 = <<SQL1;
-
-create table EventManagementSystem (
- assetId varchar(22) binary not null,
- revisionDate bigint(20) not null,
- displayTemplateId varchar(22) binary,
- checkoutTemplateId varchar(22) binary,
- managePurchasesTemplateId varchar(22) binary,
- viewPurchaseTemplateId varchar(22) binary,
- searchTemplateId varchar(22) binary,
- paginateAfter int(11) default 10,
- groupToAddEvents varchar(22) binary,
- groupToApproveEvents varchar(22) binary,
- globalPrerequisites tinyint default 1,
- globalMetadata tinyint default 1,
-primary key(assetId,revisionDate)
-)
-SQL1
-
-my $sql2 = <<SQL2;
-
-create table EventManagementSystem_products (
- productId varchar(22) binary not null,
- assetId varchar(22) binary,
- startDate bigint(20),
- endDate bigint(20),
- maximumAttendees int(11),
- approved tinyint,
- sequenceNumber int(11),
- imageId varchar(22) binary,
- prerequisiteId varchar(22) binary,
- passId text,
- passType varchar(10),
-primary key(productId)
-)
-SQL2
-
-my $sql3 = <<SQL3;
-create table EventManagementSystem_registrations (
- registrationId varchar(22) binary not null,
- productId varchar(22) binary,
- purchaseId varchar(22) binary,
- badgeId varchar(22) binary,
- returned tinyint default 0,
- primary key(registrationId))
-SQL3
-
-my $sql4 = <<SQL4;
-
-create table EventManagementSystem_purchases (
- purchaseId varchar(22) binary not null,
- transactionId varchar(22) binary,
-primary key(purchaseId)
-)
-SQL4
-
-my $sql5 = <<SQL5;
-
-create table EventManagementSystem_prerequisites (
- prerequisiteId varchar(22) binary not null,
- operator varchar(100),
- name varchar(40),
-primary key(prerequisiteId)
-)
-SQL5
-
-my $sql6 = <<SQL6;
-
-create table EventManagementSystem_prerequisiteEvents (
- prerequisiteId varchar(22) binary not null,
- requiredProductId varchar(22) binary not null,
-primary key(prerequisiteId,requiredProductId)
-)
-SQL6
-
-my $sql7 = <<SQL7;
-
-create table EventManagementSystem_metaField (
- fieldId varchar(22) binary not null,
- assetId varchar(22) binary,
- name varchar(50),
- label varchar(100),
- dataType varchar(20),
- visible tinyint default 0,
- required tinyint default 0,
- possibleValues text,
- defaultValues text,
- sequenceNumber int(5),
- autoSearch tinyint default 0,
-primary key(fieldId)
-)
-SQL7
-
-my $sql8 = <<SQL8;
-
-create table EventManagementSystem_metaData (
- fieldId varchar(22) binary not null,
- productId varchar(22) binary not null,
- fieldData text,
-primary key(fieldId,productId)
-)
-SQL8
-
-
-my $sql9 = <<SQL9;
-create table EventManagementSystem_badges (
- badgeId varchar(22) binary not null,
- userId varchar(22) binary,
- createdByUserId varchar(22) binary,
- firstName varchar(100),
- lastName varchar(100),
- address varchar(100),
- city varchar(100),
- state varchar(50),
- zipCode varchar(15),
- country varchar(255),
- phone varchar(50),
- email varchar(255),
-primary key(badgeId)
-)
-SQL9
-
-
-my $sql10 = <<SQL10;
-create table EventManagementSystem_discountPasses (
- passId varchar(22) binary not null,
- name varchar(100),
- amount varchar(22),
- type varchar(10),
-primary key(passId)
-)
-SQL10
-
-	print "\tAdding the Event Management System.\n" unless ($quiet);
-	$session->db->write($sql1);
-	$session->db->write($sql2);
-	$session->db->write($sql3);
-	$session->db->write($sql4);
-	$session->db->write($sql5);
-	$session->db->write($sql6);
-	$session->db->write($sql7);
-	$session->db->write($sql8);
-	$session->db->write($sql9);
-	$session->db->write($sql10);
-	
-	my $workflow = WebGUI::Workflow->create($session, {
-		isSerial=>1,
-		type=>"none",	
-		enabled=>1,
-		description=>"Precaches EMS event prerequisites",
-		title=>"EMS Precache"	
-	}, "EMSworkflow00000000001");
-	my $activity = $workflow->addActivity("WebGUI::Workflow::Activity::CacheEMSPrereqs","EMSactivity00000000001");
-	$activity->set("title","Precache EMS prerequisites");	
-}
-
-#-------------------------------------------------
-sub addPM {
-   my $tableList = [
-            "create table PM_wobject (
-			   assetId varchar(22) binary not null,
-			   projectDashboardTemplateId varchar(22) binary not null default 'ProjectManagerTMPL0001',
-			   projectDisplayTemplateId varchar(22) binary not null default 'ProjectManagerTMPL0002',
-			   ganttChartTemplateId varchar(22) binary not null default 'ProjectManagerTMPL0003',
-			   editTaskTemplateId varchar(22) binary not null default 'ProjectManagerTMPL0004',
-			   groupToAdd varchar(22) binary not null default 3,
-			   revisionDate bigint(20) not null,
-			   primary key (assetId, revisionDate)
-			)",
-			
-			"create table PM_project (
-			    projectId varchar(22) binary not null,
-				assetId varchar(22) binary,
-				name varchar(255) not null,
-				description text,				
-				startDate bigint(20),
-				endDate bigint(20),
-				projectManager varchar(22) binary,
-				durationUnits enum('hours','days') default 'hours',
-				hoursPerDay float default null,
-				targetBudget float(15,2) default 0.00,
-				percentComplete float not null default 0,
-				parentId varchar(22) binary default NULL,
-				creationDate bigint(20) not null,
-				createdBy varchar(22) binary not null,
-				lastUpdatedBy varchar(22) binary not null,
-				lastUpdateDate bigint(20) not null,
-				primary key (projectId)
-			)",
-			
-			"create table PM_task (
-			    taskId varchar(22) binary not null,
-				projectId varchar(22) binary not null,
-				taskName varchar(255) not null,
-				duration bigint(20) default 0,
-				startDate bigint(20),
-				endDate bigint(20),
-				dependants varchar(50),
-				parentId varchar(22) binary default NULL,
-				isMilestone integer not null default 0,
-				percentComplete float not null default 0,
-				sequenceNumber integer not null default 1,
-				resourceId varchar(22) binary default NULL,
-				creationDate bigint(20) not null,
-				createdBy varchar(22) binary not null,
-				lastUpdatedBy varchar(22) binary not null,
-				lastUpdateDate bigint(20) not null,
-				primary key (taskId)
-			)",
-			
-          ];
-
-
-   print "\tAdding the Project Management System.\n" unless ($quiet);
-   foreach (@{$tableList}) {
-      $session->db->write($_);
-   }
-
-}
-
-#-------------------------------------------------
-sub addTT {
-   my $tableList = [
-            "create table TT_wobject (
-			   assetId varchar(22) binary not null,
-			   userViewTemplateId varchar(22) binary not null default 'TimeTrackingTMPL000001',
-			   managerViewTemplateId varchar(22) binary not null default 'TimeTrackingTMPL000002',
-			   timeRowTemplateId varchar(22) binary not null default 'TimeTrackingTMPL000003',
-			   pmAssetId varchar(22) binary default NULL,
-			   groupToManage varchar(22) binary not null default 3,
-			   revisionDate bigint(20) not null,
-			   primary key (assetId, revisionDate)
-			)",
-			
-			#This table stores projects to use if the time tracker is not associated with a project management asset
-			"create table TT_projectList (
-			    projectId varchar(22) binary not null,
-				assetId varchar(22) binary,
-				projectName varchar(255) not null,
-				taskList text default null,
-				creationDate bigint(20) not null,
-				createdBy varchar(22) binary not null,
-				lastUpdatedBy varchar(22) binary not null,
-				lastUpdateDate bigint(20) not null,
-				primary key (projectId)
-			)",
-			
-			"create table TT_projectResourceList (
-			    projectId varchar(22) binary not null,
-				resourceId varchar(22) binary,
-				primary key (projectId,resourceId)
-			)",
-						
-			"create table TT_timeEntry (
-			    entryId varchar(22) binary not null,
-				projectId varchar(22) binary not null,
-				taskId varchar(255) binary not null,
-				assetId varchar(22) binary not null,
-				resourceId varchar(22) not null,
-				taskDate bigint not null,
-				hours float default 0,
-				comments text,
-				completed integer not null default 0,
-				creationDate bigint(20) not null,
-				createdBy varchar(22) binary not null,
-				lastUpdatedBy varchar(22) binary not null,
-				lastUpdateDate bigint(20) not null,
-				primary key (entryId)
-			)",
-			
-          ];
-
-
-   print "\tAdding the Time Tracking System.\n" unless ($quiet);
-   foreach (@{$tableList}) {
-      $session->db->write($_);
-   }
-
-}
-
-
-#-------------------------------------------------
-sub addSearchEngine {
-	print "\tUpgrading search engine.\n" unless ($quiet);
-	$session->config->set("searchIndexerPlugins", {
-        	"txt" => "/bin/cat",
-        	"readme"=> "/bin/cat",
-        	"html" => "/bin/cat",
-        	"htm" => "/bin/cat"
-        	});
-	$session->db->write("create table search ( 
-		assetId varchar(22) binary not null,
-		revisionDate bigint not null default 0,
-		classLimiter text,
-		searchRoot varchar(22) binary not null default 'PBasset000000000000001',
-		templateId varchar(22) binary not null default 'PBtmpl0000000000000200',
-		primary key (assetId,revisionDate)
-		)");
-	$session->db->write("create table assetIndex (
-		assetId varchar(22) binary not null primary key,
-		title varchar(255),
-		synopsis text,
-		url varchar(255),
-		creationDate bigint,
-		revisionDate bigint,
-		ownerUserId varchar(22) binary,
-		groupIdView varchar(22) binary,
-		groupIdEdit varchar(22) binary,
-		lineage varchar(255),
-		className varchar(255),
-		isPublic int not null default 1,
-		keywords mediumtext,
-		fulltext (keywords)
-		)");
-	my @searchParents = $session->db->buildArray("select parentId from asset where className='WebGUI::Asset::Wobject::IndexedSearch'");
-	my @searchIds = $session->db->buildArray("select assetId from asset where className='WebGUI::Asset::Wobject::IndexedSearch'");
-	$session->db->write("delete from asset where className='WebGUI::Asset::Wobject::IndexedSearch'");
-	my $deleteWobject = $session->db->prepare("delete from wobject where assetId=?");
-	my $deleteAssetData = $session->db->prepare("delete from assetData where assetId=?");
-	foreach my $id (@searchIds) {
-		$deleteWobject->execute([$id]);
-		$deleteAssetData->execute([$id]);
-	}
-	$deleteWobject->finish;
-	$deleteAssetData->finish;
-	$session->config->deleteFromArray("assets","WebGUI::Asset::Wobject::IndexedSearch");
-	$session->config->addToArray("assets","WebGUI::Asset::Wobject::Search");
-	$session->db->write("drop table if exists IndexedSearch");
-	$session->db->write("drop table if exists IndexedSearch_default");
-	$session->db->write("drop table if exists IndexedSearch_default_data");
-	$session->db->write("drop table if exists IndexedSearch_default_words");
-	$session->db->write("drop table if exists IndexedSearch_docInfo");
-}
-
-#-------------------------------------------------
-sub templateParsers {
-	print "\tAdding support for multiple template parsers.\n" unless ($quiet);
-	$session->config->set("templateParsers",["WebGUI::Asset::Template::HTMLTemplate"]);
-	$session->config->set("defaultTemplateParser","WebGUI::Asset::Template::HTMLTemplate");
-	$session->db->write("alter table template add column parser varchar(255) not null default 'WebGUI::Asset::Template::HTMLTemplate'");
-}
-
-#-------------------------------------------------
-sub removeFiles {
-	print "\tRemoving old unneeded files.\n" unless ($quiet);
-	unlink '../migration.txt';
-	unlink '../../lib/WebGUI/Help/Macro_StyleSheet.pm';
-	unlink '../../lib/WebGUI/Help/Macro_JavaScript.pm';
-	unlink '../../lib/WebGUI/Help/Macro_RawHeadTags.pm';
-	unlink '../../lib/WebGUI/i18n/English/Macro_StyleSheet.pm';
-	unlink '../../lib/WebGUI/i18n/English/Macro_JavaScript.pm';
-	unlink '../../lib/WebGUI/i18n/English/Macro_RawHeadTags.pm';
-	unlink '../../lib/WebGUI/Macro/StyleSheet.pm';
-	unlink '../../lib/WebGUI/Macro/JavaScript.pm';
-	unlink '../../lib/WebGUI/Macro/RawHeadTags.pm';
-	unlink '../../lib/WebGUI/MessageLog.pm';
-	unlink '../../lib/WebGUI/Operation/MessageLog.pm';
-	unlink '../../lib/WebGUI/ErrorHandler.pm';
-	unlink '../../lib/WebGUI/HTTP.pm';
-	unlink '../../lib/WebGUI/Privilege.pm';
-	unlink '../../lib/WebGUI/FormProcessor.pm';
-	unlink '../../lib/WebGUI/URL.pm';
-	unlink '../../lib/WebGUI/Id.pm';
-	unlink '../../lib/WebGUI/Icon.pm';
-	unlink '../../lib/WebGUI/Mail.pm';
-	unlink '../../lib/WebGUI/Style.pm';
-	unlink '../../lib/WebGUI/Setting.pm';
-	unlink '../../lib/WebGUI/Grouping.pm';
-	unlink '../../lib/WebGUI/Asset/Wobject/IndexedSearch.pm';
-	unlink '../../lib/WebGUI/Help/Asset_IndexedSearch.pm';
-	unlink '../../lib/WebGUI/i18n/Asset_IndexedSearch.pm';
-	unlink '../../sbin/Hourly/IndexedSearch_buildIndex.pm';
-	rmtree('../../lib/WebGUI/Asset/Wobject/IndexedSearch');
-	rmtree('../../sbin/Hourly');
-	unlink('../../sbin/runHourly.pl');
-}
-
-#-------------------------------------------------
-sub addDisabletoRichEditor {
-	print "\tUpdating Rich Editor to add master disable.\n" unless ($quiet);
-	my $sth = $session->db->read('show columns from RichEdit');
-	my $numColumns = $sth->rows;
-	$sth->finish;
-	# only add the column if it doesn't already exist.
-	$session->db->write("alter table RichEdit add column disableRichEditor int(11) default 0") if ($numColumns < 21);
-}
-
-#-------------------------------------------------
-sub changeDbCacheTimeoutName {
-	print "\tChanging dbCacheTimeout to groupCacheTimeout.\n" unless ($quiet);
-	$session->db->write("alter table groups change dbCacheTimeout groupCacheTimeout int not null default 3600");
-}
-
-#-------------------------------------------------
-sub addScratchKeys {
-	print "\tClearing user session scratch table to add keys.\n";
-	$session->db->write("delete from userSessionScratch");
-	print "\tAssigning keys to userSessionScratch.\n" unless ($quiet);
-	$session->db->write("alter table userSessionScratch ADD PRIMARY KEY (sessionId, name)");
-}
-
-#-------------------------------------------------
-sub addNavigationMimeType {
-	print "\tAdding Mime Type to Navigations.\n" unless ($quiet);
-	$session->db->write("alter table Navigation add column mimeType varchar(50) default 'text/html'");
-}
-
-#-------------------------------------------------
-sub ipsToCIDR {
-	print "\tTranslating IP addresses to CIDR format.\n" unless ($quiet);
-	print "\t\tStarting with Group ipFilters.\n" unless ($quiet);
-	my $sth = $session->db->read('select groupId, ipFilter from groups');
-	while (my $hash = $sth->hashRef) {
-		next unless $hash->{ipFilter};
-		$hash->{ipFilter} =~ s/\s//g;
-		my @ips = split /;/, $hash->{ipFilter};
-		@ips = map { ip2cidr($_) } @ips;
-		$session->db->write('update groups set ipFilter=? where groupId=?',
-				[join(',', @ips), $hash->{groupId}]);
-	}
-	print "\t\tUpdating debug Ip.\n" unless ($quiet);
-	$sth = $session->db->read("select * from settings where name='debugIp'");
-	while (my $hash = $sth->hashRef) {
-		next unless $hash->{value};
-		my @ips = split /\s+/, $hash->{value};
-		@ips = map { ip2cidr($_) } @ips;
-		$session->db->write('update settings set value=? where name=?',
-				[join(',', @ips), $hash->{name}]);
-	}
-}
-
-sub ip2cidr {
-	my ($ip) = @_;
-	$ip =~ s/\.$//;
-	my $bytes = $ip =~ tr/././;
-	my $new_bytes = 3-$bytes;
-	my $prefixLength = 32 - 8*$new_bytes;
-	$ip .= ('.0' x $new_bytes) . "/$prefixLength";
-	return $ip;
-}
-
-
-#-------------------------------------------------
-sub installSQLForm {
-	print "\tInstalling SQLForm tables.\n" unless ($quiet);
-	
-	# Skip table creation if the SQLForm is already installed.
-	return "" if WebGUI::Utility::isIn('SQLForm', $session->db->buildArray("show tables"));
-	
-	# Create tables;
-	$session->db->write(<<ENDOFQUERY1
-CREATE TABLE SQLForm (
-  assetId varchar(22) NOT NULL default '',
-  formId varchar(22) default NULL,
-  tableName varchar(255) default NULL,
-  defaultView varchar(22) default NULL,
-  searchTemplateId varchar(22) default NULL,
-  editTemplateId varchar(22) default NULL,
-  submitGroupId varchar(22) default NULL,
-  alterGroupId varchar(22) default NULL,
-  databaseLinkId varchar(22) default '0',
-  maxFileSize bigint(20) default NULL,
-  sendMailTo varchar(255) default NULL,
-  showMetaData tinyint(1) default '1',
-  revisionDate bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (assetId,revisionDate)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-ENDOFQUERY1
-);
-
-	$session->db->write(<<ENDOFQUERY2
-CREATE TABLE SQLForm_fieldDefinitions (
-  fieldId varchar(22) NOT NULL default '',
-  assetId varchar(22) NOT NULL default '',
-  property varchar(255) NOT NULL default '',
-  `value` text,
-  UNIQUE KEY fieldId (fieldId,property)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-ENDOFQUERY2
-);
-
-	$session->db->write(<<ENDOFQUERY3
-CREATE TABLE SQLForm_fieldOrder (
-  assetId varchar(22) NOT NULL default '',
-  fieldId varchar(22) NOT NULL default '',
-  rank int(11) NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-ENDOFQUERY3
-);
-
-	$session->db->write(<<ENDOFQUERY4
-CREATE TABLE SQLForm_fieldTypes (
-  fieldTypeId varchar(22) NOT NULL default '',
-  dbFieldType varchar(22) NOT NULL default '',
-  formFieldType varchar(22) NOT NULL default '',
-  PRIMARY KEY  (fieldTypeId)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-ENDOFQUERY4
-);
-
-	$session->db->write(<<ENDOFQUERY5
-CREATE TABLE SQLForm_regexes (
-  regexId varchar(22) default NULL,
-  name varchar(255) NOT NULL default '',
-  regex varchar(255) NOT NULL default '',
-  UNIQUE KEY regex (regex)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-ENDOFQUERY5
-);
-
-	# Insert default regexes
-	$session->db->write("insert into SQLForm_regexes (regexId, name, regex) values ('defaultText', 'Text', '^[\\\\w\\\\d\\\\s]*\$')");
-	$session->db->write("insert into SQLForm_regexes (regexId, name, regex) values ('defaultUnsigned', 'Unsigned integer', '^\\\\d+\$')");
-	$session->db->write("insert into SQLForm_regexes (regexId, name, regex) values ('defaultSigned', 'Signed integer', '^-?\\\\d+\$')");
-	$session->db->write("insert into SQLForm_regexes (regexId, name, regex) values ('defaultFloat', 'Floating point number', '^-?\\\\d+(\\.\\\\d+)?\$')");
-	$session->config->addToArray("assets","WebGUI::Asset::Wobject::SQLForm");
-}
-
-sub addGraphing {
-	print "\tAdding graphing system.\n" unless ($quiet);
-	
-	# Create palette and color manager tables.
-	$session->db->write(<<GRAPH1
-create table imageColor (
-	colorId			varchar(22) binary not null primary key,
-	name			varchar(255) not null default 'untitled',
-	fillTriplet		char(7) not null default '#000000',
-	fillAlpha		char(2) not null default '00',
-	strokeTriplet		char(7) not null default '#000000',
-	strokeAlpha		char(2) not null default '00'
-);
-GRAPH1
-);
-
-	$session->db->write(<<GRAPH2
-create table imagePalette (
-	paletteId		varchar(22) binary not null primary key,
-	name			varchar(255) not null default 'untitled'
-);
-GRAPH2
-);
-	
-	$session->db->write(<<GRAPH3
-create table imagePaletteColors (
-	paletteId		varchar(22) binary not null,
-	colorId			varchar(22) binary not null,
-	paletteOrder		int(11) not null,
-	primary key(paletteId, paletteOrder)
-);
-GRAPH3
-);
-
-	# Insert default palette
-	$session->db->write(<<GR1
-INSERT INTO `imageColor` VALUES 
-	('UVL-iDSq7VTks3RCH2FEWg','Green','#31ca31','99','#31ca31','00'),
-	('3Tf0W_tkAjR902FJcGZxCg','Blue','#007dff','99','#007dff','00'),
-	('fuFripVJ4es4bUBPOq3ENQ','Yellow','#ffda08','99','#ffda08','00'),
-	('n3yfk8JGilmChSer2xuZ0w','Orange','#FF8000','99','#FF8000','00'),
-	('W683fO6r8uHgZ-Z-VodY7w','Red','#FF2000','99','#FF2000','00'),
-	('pSnxDIInB9r0n06q6kKV3w','Purple','#FF00B0','99','#FF00B0','00');
-GR1
-);
-
-	$session->db->write(q|INSERT INTO `imagePalette` VALUES ('defaultPalette','Default palette')|);
-
-	$session->db->write(<<GR2
-INSERT INTO `imagePaletteColors` VALUES 
-	('defaultPalette','UVL-iDSq7VTks3RCH2FEWg',1),
-	('defaultPalette','3Tf0W_tkAjR902FJcGZxCg',2),
-	('defaultPalette','fuFripVJ4es4bUBPOq3ENQ',3),
-	('defaultPalette','n3yfk8JGilmChSer2xuZ0w',4),
-	('defaultPalette','W683fO6r8uHgZ-Z-VodY7w',5),
-	('defaultPalette','pSnxDIInB9r0n06q6kKV3w',6);
-GR2
-);	
-
-	# Create fontmanager tables.
-	$session->db->write(<<GRAPH4
-create table imageFont (
-	fontId 			varchar(22) binary not null primary key, 
-	name 			varchar(255), 
-	storageId 		varchar(22), 
-	filename 		varchar(255)
-);
-GRAPH4
-);
-
-	$session->db->write(q|insert into imageFont (fontId, name, filename) values ('defaultFont', 'WebGUI default font', 'default.ttf')|);
-
-	# Update Poll table.
-	$session->db->write('alter table Poll add column graphConfiguration text');
-	$session->db->write('alter table Poll add column generateGraph tinyint(1)');
-
-	# Add plugins to the config file
-	$session->config->set('graphingPlugins', [
-		"WebGUI::Image::Graph::XYGraph::Bar",
-		"WebGUI::Image::Graph::XYGraph::Line",
-		"WebGUI::Image::Graph::Pie",
-	]);
- 
-}
-
-sub updateProfileListFields {
-	foreach ("UPDATE userProfileField SET fieldType='selectBox' WHERE fieldType='selectList' and fieldName in ('language','gender','dateFormat','timeFormat','discussionLayout','INBOXNotifications','firstDayOfWeek','uiLevel','toolbar')",
-	"UPDATE userProfileField SET dataDefault='\\'English\\'' WHERE fieldName='language'",
-"UPDATE userProfileField SET dataDefault='\\'neuter\\'' WHERE fieldName='gender'",
-"UPDATE userProfileField SET dataDefault='\\'%M/%D/%y\\'' WHERE fieldName='dateFormat'",
-"UPDATE userProfileField SET dataDefault='\\'%H:%n %p\\'' WHERE fieldName='timeFormat'",
-"UPDATE userProfileField SET dataDefault='\\'nested\\'' WHERE fieldName='discussionLayout'",
-"UPDATE userProfileField SET dataDefault='\\'email\\'' WHERE fieldName='INBOXNotifications'",
-"UPDATE userProfileField SET dataDefault='\\'0\\'' WHERE fieldName='firstDayOfWeek'",
-"UPDATE userProfileField SET dataDefault='\\'5\\'' WHERE fieldName='uiLevel'",
-"UPDATE userProfileField SET dataDefault='\\'useLanguageDefault\\'' WHERE fieldName='toolbar'") {
-		$session->db->write($_);
-	}
-}
-
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
diff --git a/docs/upgrades/upgrade_6.99.0-6.99.1.pl b/docs/upgrades/upgrade_6.99.0-6.99.1.pl
deleted file mode 100644
index cfebeb16f..000000000
--- a/docs/upgrades/upgrade_6.99.0-6.99.1.pl
+++ /dev/null
@@ -1,126 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "6.99.1"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-fixTypos($session);
-updateTemplates();
-csFixes();
-
-finish($session); # this line required
-
-#-------------------------------------------------
-sub csFixes {
-        print "\tFixing CS stuff.\n" unless ($quiet);
-	$session->db->write("alter table Collaboration add column autoSubscribeToThread int not null default 1");
-        $session->db->write("alter table Collaboration add column requireSubscriptionForEmailPosting int not null default 1");
-        $session->db->write("alter table Thread_read add index threadId_userId (threadId,userId)");
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-        print "\tFixing template problems\n" unless ($quiet);
-	opendir(DIR,"templates-6.99.1");
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $folder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => "7.0.0 New Templates",
-		menuTitle => "7.0.0 New Templates",
-		url=> "7_0_0_new_templates",
-		groupIdView=>"12"
-		});
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-6.99.1/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			my $template = $folder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub fixTypos {
-	my $session = shift;
-	print "\tFixing typos.\n" unless ($quiet);
-	my $activities = $session->config->get("workflowActivities");
-	my $versionTag = $activities->{"WebGUI::VersionTag"};
-	my @newStuff = ("WebGUI::Workflow::Activity::ExportVersionTagToHtml");
-	foreach my $value (@{$versionTag}) {
-		push(@newStuff, $value);
-	}
-	$activities->{"WebGUI::VersionTag"} = \@newStuff;
-	$session->config->set("workflowActivities",$activities);
-}
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
diff --git a/docs/upgrades/upgrade_6.99.1-6.99.2.pl b/docs/upgrades/upgrade_6.99.1-6.99.2.pl
deleted file mode 100644
index 081ef87fb..000000000
--- a/docs/upgrades/upgrade_6.99.1-6.99.2.pl
+++ /dev/null
@@ -1,181 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "6.99.2"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-updateTT();
-addToolbarUiLevels();
-
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub addToolbarUiLevels {
-   	print "\tAdding asset toolbar UI levels.\n" unless ($quiet);
-	$session->config->set("assetToolbarUiLevel", {
-        "edit" => 1,
-        "delete" => 1,
-        "cut" => 1,
-        "copy" => 1,
-        "shortcut" => 5,
-        "editBranch" => 9,
-        "lock" => 5,
-        "export" => 9,
-        "changeUrl" => 9,
-        "promote" => 3,
-        "demote" => 3,
-        "manage" => 5,
-        "revisions" => 5,
-        "view" => 1
-        });
-}
-
-#-------------------------------------------------
-sub updateTT {
-   print "\tUpdating the Time Tracking System.\n" unless ($quiet);
-   my $tableList = [
-            "create table TT_projectTasks (
-                taskId varchar(22) binary not null,
-                projectId varchar(22) binary not null,
-                taskName varchar(255) not null,
-                primary key (taskId)
-            )",
-			"alter table TT_timeEntry modify taskId varchar(22) binary not null",
-			"alter table TT_projectList drop column taskList",
-			"create table TT_report (
-			   reportId varchar(22) binary not null,
-			   assetId varchar(22) not null,
-			   startDate varchar(10) not null,
-			   endDate varchar(10) not null,
-			   reportComplete integer not null default 0,
-			   resourceId varchar(22) binary not null,
-			   creationDate bigint not null,
-			   createdBy varchar(22) binary not null,
-			   lastUpdatedBy varchar(22) binary not null,
-			   lastUpdateDate bigint not null
-			)",
-			"alter table TT_timeEntry add reportId varchar(22) binary not null",
-			"alter table TT_timeEntry modify taskDate varchar(10) not null",
-			"alter table TT_timeEntry drop column assetId",
-			"alter table TT_timeEntry drop column resourceId",
-			"alter table TT_timeEntry drop column completed",
-			"alter table TT_timeEntry drop column creationDate",
-			"alter table TT_timeEntry drop column createdBy",
-			"alter table TT_timeEntry drop column lastUpdatedBy",
-			"alter table TT_timeEntry drop column lastUpdateDate"
-          ];
-
-   foreach (@{$tableList}) {
-      $session->db->write($_);
-   }
-
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
diff --git a/docs/upgrades/upgrade_6.99.2-6.99.3.pl b/docs/upgrades/upgrade_6.99.2-6.99.3.pl
deleted file mode 100644
index 4de727e63..000000000
--- a/docs/upgrades/upgrade_6.99.2-6.99.3.pl
+++ /dev/null
@@ -1,321 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "6.99.3"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-addAssetIndex();
-fixCs();
-fixCss();
-fixSpectre();
-fixTT();
-
-finish($session); # this line required
-
-#-------------------------------------------------
-sub addAssetIndex {
-	print "\tAdding a new asset index.\n" unless ($quiet);
-	$session->db->write("alter table asset add index state_lineage (state,lineage)");
-}
-
-#-------------------------------------------------
-sub fixSpectre {
-	print "\tAdding more security to Spectre.\n" unless ($quiet);
-	unless (-e "../../etc/spectre.conf") {
-		print "\t *** Skiping this portion of the upgrade.  You do not have a spectre.conf file.  Read gotcha.txt for details. ***\n" unless ($quiet);
-		return;
-	}
-	my $config = WebGUI::Config->new("../..","spectre.conf");
-	$config->set("ip","127.0.0.1");
-}
-
-#-------------------------------------------------
-sub fixCss {
-	print "\tUpdating CSS.\n" unless ($quiet);
-	my $asset = WebGUI::Asset->new($session, "7.0-style0000000000051","WebGUI::Asset::Snippet");
-	if (defined $asset) {
-		my $css = <<STOP;
-body, html {
-        margin:0px;
-        background-color:#b53018;
-        padding:0px;
-}
-body a {
-        color:#EE963E;
-}
-#main {
-        width:98%;
-        /*min-width:790px;*/
-        margin:0px;
-        padding:0px;
-        padding-top:20px;
-        padding-bottom:20px;
-        position:relative;
-}
-#header { 
-        background: url('^FileUrl(style3/header_bg.jpg);') repeat-x;
-        width:100%;
-        margin:0px;
-        height:115px;
-}
-#headerTitle {
-        background: url('^FileUrl(style3/header_left.jpg);') no-repeat left top;
-        height:100%;
-        width:100%;
-}
-#headerRight {
-        background: url('^FileUrl(style3/header_right.jpg);') no-repeat right top;
-        width:100%;
-        height:100%;
-        text-align:right;
-        position:relative;
-}
-#headerRight #title {
-        position:absolute;
-        top:25px;
-        left:20px;
-        font-family:arial;
-        text-align:left;
-}
-#title h1 {
-        text-transform:uppercase;
-        margin-bottom:0px;
-        font-weight:normal;
-        font-size:26pt;
-        margin-top:0px;
-        color:white;
-}
-#title h1 a {
-        color:white;
-        text-decoration:none;
-}
-#title h2 {
-        margin:0px;
-        font-size:12pt;
-        color:#bebebe;
-        padding-left:20px;
-}
-#title img {
-        z-index:5;
-}
-#login {
-        position:absolute;
-        font-size:8pt;
-        top:45%;
-        right:150px;
-        color:white;
-        z-index:6;
-        font-family:arial;
-}
-#login a {
-        color:white;
-}
-.loginBox {
-        font-size:8pt;
-        margin:0px;
-        display:inline;
-}
-.loginBox input {
-        font-size:8pt;
-}
-
-#mainBody {
-        width:100%;
-        margin:0px;
-        height:500px;
-        background: #fff;
-        position:relative;
-}
-#main > #mainBody {
-        height:auto;
-        min-height:500px;
-}
-#contentArea {
-        z-index:2;
-        position:relative;
-        padding-top:50px;
-        padding-left:10px;
-        padding-right:20px;
-        padding-bottom:20px;
-        -moz-box-sizing:border:box;
-        font-family:verdana;
-        font-size:9pt;
-
-}
-html #main #mainBody #contentArea {
-        height:1%;
-}
-#contentArea a {
-        font-weight:bold;
-        letter-spacing:1px;
-        font-size:8pt;
-}
-#topCorner {
-        width:100%;
-        height:214px;
-        position:absolute;
-        top:0px;
-        left:0px;
-        background: url('^FileUrl(style3/main_top_bg.jpg);') repeat-x;
-        z-index:1;
-}
-#bottomCorner {
-        width:100%;
-        height:211px;
-        position:absolute;
-        bottom:0px;
-        right:0px;
-        background: url('^FileUrl(style3/main_bottom.jpg);') no-repeat right;
-        z-index:1;
-}
-
-#footer {
-        width:100%;
-        margin:0px;
-        background:#000 url('^FileUrl(style3/footer_right.jpg);') no-repeat right top;
-        height:57px;
-        border-top:solid #B53018 2px;
-        text-align:right;
-        position:relative;
-}
-#footer #copyright {
-        color:#3b3b3b;
-        font-family:arial;
-        position:absolute;
-        top:20px;
-        left:30px;
-        font-size:8pt;
-}
-STOP
-		$asset->addRevision({
-			snippet=>$css
-			});
-	}
-}
-
-
-#-------------------------------------------------
-sub fixCs {
-	print "\tFixing CS bugs.\n" unless ($quiet);
-	$session->db->write("alter table Thread change karmaRank karmaRank float(11,6)");
-	$session->db->write("update Thread set karmaRank=karma/karmaScale");
-}
-
-#-------------------------------------------------
-sub fixTT {
-   print "\tUpdating the Time Tracking System.\n" unless ($quiet);
-   my $tableList = [
-			"alter table TT_wobject add pmIntegration integer not null default 0"
-          ];
-
-   foreach (@{$tableList}) {
-      $session->db->write($_);
-   }
-
-}
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_6.99.3-6.99.4.pl b/docs/upgrades/upgrade_6.99.3-6.99.4.pl
deleted file mode 100644
index 7462e22bc..000000000
--- a/docs/upgrades/upgrade_6.99.3-6.99.4.pl
+++ /dev/null
@@ -1,178 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "6.99.4"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-
-fixSurvey($session);
-fixEditWorkflow($session);
-updateHttpProxy();
-fixShippingOptions();
-
-finish($session); # this line required
-
-#-------------------------------------------------
-sub fixShippingOptions {
-	print "\tRemoving unserialized shipping options data from the transaction table.\n";
-	$session->db->write("update transaction set shippingOptions = null where shippingOptions like '%HASH%'");
-}
-
-#-------------------------------------------------
-sub updateHttpProxy {
-	print "\tAllowing HTTP Proxy to use ampersands in addition to semicolons in URLs.\n" unless ($quiet);
-	$session->db->write("alter table HttpProxy add column useAmpersand int not null default 0");
-}
-
-#-------------------------------------------------
-sub fixSurvey{
-	my $session = shift;
-	print "\tFixing Surveys.\n" unless ($quiet);
-	
-	# Add a defaultSectionId column to Survey table
-	$session->db->write("alter table Survey add column (defaultSectionId varchar(22) binary not null)");
-
-	# Set defaultSectionId for existing Surveys by finding the sectionId for the section called 'none' and update the asset
-	my @surveyAssets = $session->db->buildArray("select assetId from asset where className='WebGUI::Asset::Wobject::Survey'");
-	foreach my $assetId (@surveyAssets) {
-		my $survey = WebGUI::Asset->new($session, $assetId, 'WebGUI::Asset::Wobject::Survey');
-		my $i18n = WebGUI::International->new($session, 'Asset_Survey');
-		my $noneLabel = $i18n->get(107);
-		my $surveyId = $survey->get('Survey_id');
-		my ($defaultSectionId) = $session->db->quickArray("select Survey_sectionId from Survey_section where Survey_id=? and sectionName=?", [$surveyId,$noneLabel]);
-		$survey->update({defaultSectionId => $defaultSectionId});  
-	}
-}
-
-#--------------------------------------------------
-sub fixEditWorkflow {
-	my @goodPlugins;
-	my $session = shift;
-	print "\tRemoving erroneous ExportVersionTagAsHtml workflow activity from config file.\n" unless ($quiet);
-
-	my $workflow = $session->config->get('workflowActivities');
-
-	foreach (@{$workflow->{'WebGUI::VersionTag'}}) {
-		push (@goodPlugins, $_) if ($_ ne 'WebGUI::Workflow::Activity::ExportVersionTagAsHtml');
-	}
-
-	$workflow->{'WebGUI::VersionTag'} = \@goodPlugins;
-	
-	$session->config->set('workflowActivities', $workflow);
-}
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_6.99.4-6.99.5.pl b/docs/upgrades/upgrade_6.99.4-6.99.5.pl
deleted file mode 100644
index 9eddfc2de..000000000
--- a/docs/upgrades/upgrade_6.99.4-6.99.5.pl
+++ /dev/null
@@ -1,168 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "6.99.5"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-fixGroups();
-
-# upgrade functions go here
-
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub fixGroups {
-   print "\tUpdating Groups.\n" unless ($quiet);
-   my $tableList = [
-			"alter table groups add ldapLinkId varchar(22) binary default NULL"
-          ];
-
-   foreach (@{$tableList}) {
-      $session->db->write($_);
-   }
-   
-   my $ldapLinks = {};
-   
-   my $links = WebGUI::LDAPLink->getList($session);
-   foreach my $linkId (keys %{$links}) {
-      my $ldapLink = WebGUI::LDAPLink->new($session,$linkId);
-	  if ($ldapLink->bind) {
-	     $ldapLinks->{$linkId} = $ldapLink;
-	  } 
-   }
-   
-   
-   #Try to figure out which LDAP link each group belongs to
-   my $sth = $session->db->read("select groupId, ldapGroup, ldapGroupProperty from groups where ldapGroup is not NULL and ldapGroupProperty is not NULL and ldapGroup != '' and ldapGroupProperty != ''");
-   while (my $hash = $sth->hashRef) {
-	  foreach my $linkId (keys %{$ldapLinks}) {
-	     my $ldapLink = $ldapLinks->{$linkId};
-         my $people = $ldapLink->getProperty($hash->{ldapGroup},$hash->{ldapGroupProperty});
-	     if($people && scalar(@{$people})) {
-	        $session->db->write("update groups set ldapLinkId=? where groupId=?",[$linkId,$hash->{groupId}]);
-		 }
-      }
-   }
-   
-   foreach my $linkId (keys %{$ldapLinks}) {
-      my $ldapLink = $ldapLinks->{$linkId};
-	  $ldapLink->unbind;
-   }
-   
-
-}
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_6.99.5-7.0.0.pl b/docs/upgrades/upgrade_6.99.5-7.0.0.pl
deleted file mode 100644
index e8b47121a..000000000
--- a/docs/upgrades/upgrade_6.99.5-7.0.0.pl
+++ /dev/null
@@ -1,132 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.0.0"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-fixCommerceSettings();
-
-finish($session); # this line required
-
-#--------------------------------------------------
-sub fixCommerceSettings {
-	print "\tFixing Commerce Settings.\n" unless ($quiet);
-	$session->db->write("insert into settings (name,value) values ('commercePurchaseHistoryTemplateId','PBtmpl0000000000000019')");
-}
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.0.0-7.0.1.pl b/docs/upgrades/upgrade_7.0.0-7.0.1.pl
deleted file mode 100644
index 415b47527..000000000
--- a/docs/upgrades/upgrade_7.0.0-7.0.1.pl
+++ /dev/null
@@ -1,162 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Operation::Shared;
-use Data::Dumper;
-
-my $toVersion = "7.0.1"; # make this match what version you're going to
-my $quiet; # this line required
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-i18nDepartmentNames();
-addMissingAssets();
-addLDAPRecursiveFilter();
-
-finish($session); # this line required
-
-#--------------------------------------------------
-sub addMissingAssets {
-	print "\tAdding assets to config file that weren't added before.\n" unless ($quiet);
-	my $config = $session->config;
-	$config->addToArray("assets","WebGUI::Asset::Wobject::TimeTracking");
-	$config->addToArray("assets","WebGUI::Asset::Wobject::ProjectManager");
-	$config->addToArray("assets","WebGUI::Asset::Wobject::EventManagementSystem");
-}
-
-#--------------------------------------------------
-sub i18nDepartmentNames {
-	print "\tInternationalizing department settings in user profile\n" unless ($quiet);
-	$session->db->write(q!update userProfileField set label=? where fieldName='department'!, ["WebGUI::International::get('Department','Asset_InOutBoard')"]);
-	my ($codeValues) = $session->db->quickArray(q|select possibleValues from userProfileField where fieldName='department'|);
-
-	my $possibleValues = WebGUI::Operation::Shared::secureEval($session, $codeValues);
-	delete $possibleValues->{IT};
-	delete $possibleValues->{HR};
-	delete $possibleValues->{'Regular Staff'};
-	local $Data::Dumper::Terse = 1;
-	my $i18nValues = Dumper $possibleValues;
-	$i18nValues =~ s/\{/{'IT'=>WebGUI::International::get('IT','Asset_InOutBoard'),'HR'=>WebGUI::International::get('HR','Asset_InOutBoard'),'Regular Staff'=>WebGUI::International::get('Regular Staff','Asset_InOutBoard')/;
-	$session->db->write(q!update userProfileField set possibleValues=? where fieldName='department'!, [$i18nValues]);
-}
-
-#--------------------------------------------------
-sub addLDAPRecursiveFilter() {
-   print "\tAdding LDAP recursive filter.\n" unless ($quiet);
-   $session->db->write("alter table groups add ldapRecursiveFilter varchar(255) default null");
-   $session->db->write("alter table ldapLink add ldapGlobalRecursiveFilter varchar(255) default null");
-}
-
-
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.0.1-7.0.2.pl b/docs/upgrades/upgrade_7.0.1-7.0.2.pl
deleted file mode 100644
index 0bbda1bfb..000000000
--- a/docs/upgrades/upgrade_7.0.1-7.0.2.pl
+++ /dev/null
@@ -1,143 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Utility;
-
-my $toVersion = "7.0.2"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-addAdminToVisitorGroup($session);
-addReversePageLoopColumn($session);
-
-finish($session); # this line required
-
-sub addAdminToVisitorGroup {
-	my $session = shift;
-	my $Visitor = WebGUI::Group->new($session, '1');
-	$Visitor->addGroups([3]);
-	return 1;
-}
-
-sub addReversePageLoopColumn {
-	my $session = shift;
-	print "\tAdding the reversePageLoop column to the Navigation table\n" unless ($quiet);
-
-	my @columns = $session->db->buildArray('describe Navigation');
-	unless (isIn('reversePageLoop', @columns)) {
-		$session->db->write('alter table Navigation add column reversePageLoop tinyint(1) default 0');
-	}
-}
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.0.2-7.0.3.pl b/docs/upgrades/upgrade_7.0.2-7.0.3.pl
deleted file mode 100644
index 740ea2b14..000000000
--- a/docs/upgrades/upgrade_7.0.2-7.0.3.pl
+++ /dev/null
@@ -1,148 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Asset;
-use WebGUI::HTML;
-
-my $toVersion = "7.0.3"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-sleep(1); # todd prevent duplicate timestamps
-my $session = start(); # this line required
-
-deleteTemplate();
-addConfigOption();
-fixPostSubjects();
-
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub fixPostSubjects {
-	print "\tRemoving HTML from CS Post subjects.\n" unless ($quiet);
-	my $write = $session->db->prepare("update assetData set title=? where assetId=? and revisionDate=?");
-	my $sth = $session->db->read("select title, asset.assetId, assetData.revisionDate from assetData left join asset on assetData.assetId=asset.assetId where asset.className like 'WebGUI::Asset::Post%'");
-	while (my $row = $sth->arrayRef) {
-		$row->[0] = WebGUI::HTML::filter($row->[0], "all");		
-		$write->execute($row);
-	}
-}
-
-#-------------------------------------------------
-sub addConfigOption {
-	print "\tAdding save and commit option.\n" unless ($quiet);
-	$session->config->set("enableSaveAndCommit", 0);
-}
-
-#-------------------------------------------------
-sub deleteTemplate {
-	print "\tDeleting a template that was accidentally added.\n" unless ($quiet);
-	my $template = WebGUI::Asset->newByDynamicClass($session, "wCIc38CvNHUK7aY92Ww4SQ");
-	if (defined $template) {
-		$template->purge({skipExported=>1});
-	}
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.0.3-7.0.4.pl b/docs/upgrades/upgrade_7.0.3-7.0.4.pl
deleted file mode 100644
index 5f582bd74..000000000
--- a/docs/upgrades/upgrade_7.0.3-7.0.4.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.0.4"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.0.4-7.0.5.pl b/docs/upgrades/upgrade_7.0.4-7.0.5.pl
deleted file mode 100644
index 575cd0d69..000000000
--- a/docs/upgrades/upgrade_7.0.4-7.0.5.pl
+++ /dev/null
@@ -1,126 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Asset;
-
-my $toVersion = "7.0.5"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-renameTemplate();
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub renameTemplate {
-	print "\tRenaming a template.\n" unless ($quiet);
-	my $asset = WebGUI::Asset->new($session, "PBtmpl0000000000000209", "WebGUI::Asset::Template");
-	if (defined $asset) {
-		$asset->update({title=>"Request Tracker Thread",menuTitle=>"Request Tracker Thread"});
-	}
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.0.5-7.0.6.pl b/docs/upgrades/upgrade_7.0.5-7.0.6.pl
deleted file mode 100644
index 736116257..000000000
--- a/docs/upgrades/upgrade_7.0.5-7.0.6.pl
+++ /dev/null
@@ -1,126 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.0.6"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-addNewWorkflowActivity();
-
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub addNewWorkflowActivity {
-	print "\tAdding 'add user to group' workflow activity.\n" unless ($quiet);
-	my $activities = $session->config->get("workflowActivities");
-	push(@{$activities->{"WebGUI::User"}}, "WebGUI::Workflow::Activity::AddUserToGroup");
-	$session->config->set("workflowActivities", $activities);
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.0.6-7.0.7.pl b/docs/upgrades/upgrade_7.0.6-7.0.7.pl
deleted file mode 100644
index de080e8f0..000000000
--- a/docs/upgrades/upgrade_7.0.6-7.0.7.pl
+++ /dev/null
@@ -1,174 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.0.7"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-giveTasksMultipleResources($session);
-giveTasksLagTime($session);
-giveProjectsObserverGroup($session);
-
-finish($session); # this line required
-
-
-
-sub giveTasksMultipleResources {
-	my $session = shift;
-	print "\tMaking tasks handle multiple resources.\n" unless $quiet;
-	$session->db->write($_) for(<<'EOT',
-  CREATE TABLE PM_taskResource (
-    taskResourceId varchar(22) character set utf8 collate utf8_bin NOT NULL,
-    taskId varchar(22) character set utf8 collate utf8_bin NOT NULL,
-    sequenceNumber int(11) NOT NULL,
-    resourceKind enum('user', 'group') NOT NULL,
-    resourceId varchar(22) character set utf8 collate utf8_bin NOT NULL,
-    UNIQUE (taskId, resourceKind, resourceId),
-    UNIQUE (taskId, sequenceNumber),
-    PRIMARY KEY (taskResourceId)
-  ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-EOT
-				     <<'EOT',
-  INSERT INTO PM_taskResource
-  (taskResourceId, taskId, sequenceNumber, resourceKind, resourceId)
-    SELECT taskId, taskId, 1, 'user', resourceId
-      FROM PM_task WHERE resourceId IS NOT NULL;
-EOT
-				     <<'EOT',
-  ALTER TABLE PM_task
-  DROP COLUMN resourceId;
-EOT
-				     <<'EOT',
-  ALTER TABLE PM_wobject
-   ADD COLUMN resourcePopupTemplateId varchar(22) character set utf8 collate utf8_bin NOT NULL
-              DEFAULT 'ProjectManagerTMPL0005',
-   ADD COLUMN resourceListTemplateId varchar(22) character set utf8 collate utf8_bin NOT NULL
-              DEFAULT 'ProjectManagerTMPL0006'
-EOT
-				    );
-}
-
-sub giveTasksLagTime {
-	my $session = shift;
-	print "\tGiving tasks lag time.\n" unless $quiet;
-	$session->db->write($_) for(<<'EOT',
-  ALTER TABLE PM_task ADD COLUMN lagTime bigint(20) DEFAULT 0;
-EOT
-				   );
-}
-
-sub giveProjectsObserverGroup {
-	my $session = shift;
-	print "\tGiving projects observer groups.\n" unless $quiet;
-	$session->db->write($_) for(<<'EOT',
-  ALTER TABLE PM_project
-   ADD COLUMN projectObserver varchar(22) character set utf8 collate utf8_bin DEFAULT '7';
-EOT
-				   );
-}
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.0.7-7.0.8.pl b/docs/upgrades/upgrade_7.0.7-7.0.8.pl
deleted file mode 100644
index 7dea9bb01..000000000
--- a/docs/upgrades/upgrade_7.0.7-7.0.8.pl
+++ /dev/null
@@ -1,147 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.0.8"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-fixRobotsTxtMimeType($session);
-fixSearch();
-
-# upgrade functions go here
-
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub fixSearch {
-	print "\tFixing search.\n" unless ($quiet);
-	my $sth = $session->db->read("describe assetIndex lineage");
-	my $exists = $sth->rows;
-	$sth->finish;
-	unless ($exists) {
-		$session->db->write("alter table assetIndex add column lineage varchar(255)");
-	}
-}
-
-#-------------------------------------------------
-sub fixRobotsTxtMimeType {
-	my $session = shift;
-	print "\tFixing MIME type of robots.txt snippet.\n" unless $quiet;
-
-	my $asset = WebGUI::Asset->newByDynamicClass($session, 'pbrobot000000000000001');
-	unless (defined $asset) {
-		print "\t\tCouldn't find it; skipping this.\n";
-		return;
-	}
-	unless ($asset->isa('WebGUI::Asset::Snippet')) {
-		print "\t\tWrong asset class; skipping this.\n";
-		return;
-	}
-
-	$asset->update({mimeType => 'text/plain'});
-}
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.0.8-7.0.9.pl b/docs/upgrades/upgrade_7.0.8-7.0.9.pl
deleted file mode 100644
index baca27d1e..000000000
--- a/docs/upgrades/upgrade_7.0.8-7.0.9.pl
+++ /dev/null
@@ -1,143 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.0.9";
-my $quiet;
-
-my $session = start();
-
-pmAddProgressiveTasks($session);
-
-finish($session);
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-sub pmAddProgressiveTasks {
-	my $session = shift;
-	print "\tMaking progressive tasks representable.\n" unless $quiet;
-	$session->db->write($_) for(<<'EOT',
-    ALTER TABLE PM_task
-     ADD COLUMN taskType enum('timed', 'progressive', 'milestone') NOT NULL
-                DEFAULT 'timed',
-  CHANGE COLUMN percentComplete percentComplete float NULL DEFAULT NULL
-EOT
-				    <<'EOT',
-    UPDATE PM_task SET taskType = 'milestone'
-                   AND percentComplete = NULL
-     WHERE isMilestone = 1
-EOT
-				    <<'EOT',
-  ALTER TABLE PM_task
-  DROP COLUMN isMilestone
-EOT
-				   );
-}
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.0.9-7.1.0.pl b/docs/upgrades/upgrade_7.0.9-7.1.0.pl
deleted file mode 100755
index 27a601ddb..000000000
--- a/docs/upgrades/upgrade_7.0.9-7.1.0.pl
+++ /dev/null
@@ -1,210 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Workflow;
-
-my $toVersion = "7.1.0"; # make this match what version you're going to
-my $quiet; # this line required
-
-my $session = start(); # this line required
-
-recalculateProjectCompletion($session);
-updateSqlReportTable($session);
-updateProductsTable($session);
-makeLdapRecursiveFiltersText($session);
-addImageStuffToCs($session);
-addNewAuthSettings($session);
-addAutoLDAPRegistration($session);
-
-finish($session); # this line required
-
-#-------------------------------------------------
-sub addAutoLDAPRegistration {
-        my $session = shift;
-	print "\tAdding new feature that allows autoregistration of WebGUI users from LDAP directories.\n" unless $quiet;
-
-	# Put an entry in the settings table to turn this thing on and off
-	$session->db-write("insert into settings (name,value) values ('automaticLDAPRegistration',0)");
-
-	# Enable our new workflow activity in the config file
-	my $activities = $session->config->get("workflowActivities");
-	push (@{$activities->{'WebGUI::User'}}, 'WebGUI::Workflow::Activity::SyncProfileToLdap');
-	$session->config->set("workflowActivities", $activities);
-
-	# Add a workflow that the LDAP auth module can kick off to pull the users info from LDAP to their wG user profile.
-        my $workflow = WebGUI::Workflow->create($session, {
-                type=>"WebGUI::User",
-                enabled=>1,
-                description=>"Synchronizes a users LDAP information to their WebGUI User Profile",
-                title=>"Synchronize Profile To LDAP"
-        }, "AuthLDAPworkflow000001");
-        my $activity = $workflow->addActivity("WebGUI::Workflow::Activity::SyncProfileToLdap");
-        $activity->set("title","Synchronize Profile To LDAP");
-}
-
-#-------------------------------------------------
-sub addNewAuthSettings {
-	my $session = shift;
-	print "\tAdding new WebGUI auth settings to support strong passwords.\n" unless $quiet;
-	my $newSettings = {
-		webguiRequiredDigits => 0,
-		webguiNonWordCharacters => 0,
-		webguiRequiredMixedCase => 0,	
-	};
-	foreach my $setting (keys %{$newSettings}) {
-		$session->db->write("insert into settings (name,value) values (?,?)",[$setting,$newSettings->{$setting}]);
-	}
-}
-
-#-------------------------------------------------
-sub addImageStuffToCs {
-	my $session = shift;
-	print "\tAdding thumbnail and image sizing to CS.\n" unless $quiet;
-	$session->db->write("alter table Collaboration add column thumbnailSize int not null default 0");
-	$session->db->write("alter table Collaboration add column maxImageSize int not null default 0");
-}
-
-
-#-------------------------------------------------
-sub recalculateProjectCompletion {
-	my $session = shift;
-	print "\tForcing project completion recalculation.\n" unless $quiet;
-	my @assetIds = $session->db->buildArray("SELECT DISTINCT assetId FROM PM_wobject", []);
-	foreach my $assetId (@assetIds) {
-		my $pm = WebGUI::Asset->newByDynamicClass($session, $assetId);
-		my @projectIds = $session->db->buildArray("SELECT projectId FROM PM_project WHERE assetId = ?", [$assetId]);
-		foreach my $project (@projectIds) {
-			$pm->updateProject($project);
-		}
-	}
-}
-
-#-------------------------------------------------
-sub updateSqlReportTable {
-	my $session = shift;
-	print "\tUpdating SQLReport table structure.\n" unless ($quiet);
-	$session->db->write("alter table `SQLReport` ADD COLUMN ( downloadType varchar(255), downloadFilename varchar(255), downloadTemplateId varchar(22), downloadMimeType varchar(255), downloadUserGroup varchar(22))");
-}
-
-#-------------------------------------------------
-sub updateProductsTable {
-	my $session	= shift;
-	print "\tUpdating products table structure.\n" unless ($quiet);
-	$session->db->write("alter table products add column (groupId varchar(22), groupExpiresOffset varchar(16))");
-}
-
-#-------------------------------------------------
-sub makeLdapRecursiveFiltersText {
-	my $session = shift;
-	print "\tMaking LDAP recursive filters text fields.\n" unless $quiet;
-	$session->db->write($_) for(<<'EOT',
-    ALTER TABLE ldapLink
-  CHANGE COLUMN ldapGlobalRecursiveFilter ldapGlobalRecursiveFilter mediumtext NULL DEFAULT NULL
-EOT
-				    <<'EOT',
-    ALTER TABLE groups
-  CHANGE COLUMN ldapRecursiveFilter ldapRecursiveFilter mediumtext NULL DEFAULT NULL
-EOT
-				   )
-}
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.1.0-7.1.1.pl b/docs/upgrades/upgrade_7.1.0-7.1.1.pl
deleted file mode 100644
index 4df3c5d7e..000000000
--- a/docs/upgrades/upgrade_7.1.0-7.1.1.pl
+++ /dev/null
@@ -1,132 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.1.1"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-fixSurvey();
-fixLDAP();
-
-finish($session); # this line required
-
-#-------------------------------------------------
-sub fixLDAP {
-	print "\tFixing the ldap connection setting.\n" unless ($quiet);
-	# Set the LDAP connection setting to the default ldap link if it's not set to anything
-	my $ldapConnection = $session->setting->get("ldapConnection");
-	$session->setting->set("ldapConnection", "1uBbhUm686mkFZ1ghv7Lag") if ($ldapConnection eq "");
-}
-
-#-------------------------------------------------
-sub fixSurvey {
-	print "\tFixing answer truncation in survey.\n" unless ($quiet);
-	$session->db->write("alter table Survey_questionResponse change response response text");
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.1.1-7.1.2.pl b/docs/upgrades/upgrade_7.1.1-7.1.2.pl
deleted file mode 100644
index 107cadcc2..000000000
--- a/docs/upgrades/upgrade_7.1.1-7.1.2.pl
+++ /dev/null
@@ -1,137 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.1.2"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-fixAssetVersionTag($session);
-
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-#-------------------------------------------------
-sub fixAssetVersionTag {
-	my $session = shift;
-	print "\tFixing assetVersionTag database table.\n" unless ($quiet);
-	
-	$session->db->write("alter table assetVersionTag alter lockedBy set default ''");
-	$session->db->write("alter table assetVersionTag alter groupToUse set default ''");
-	$session->db->write("alter table assetVersionTag alter workflowId set default ''");
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.1.2-7.1.3.pl b/docs/upgrades/upgrade_7.1.2-7.1.3.pl
deleted file mode 100644
index a49a77493..000000000
--- a/docs/upgrades/upgrade_7.1.2-7.1.3.pl
+++ /dev/null
@@ -1,151 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.1.3"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-insertAutomaticLDAPRegistrationSetting($session);
-changeGraphConfigColumnType($session);
-addIndicies($session);
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub addIndicies {
-	my $session = shift;
-	print "\tAdding database table indicies to improve performance.\n" unless ($quiet);
-	my $db = $session->db;
-	$db->write("alter table template add index namespace_showInForms (namespace, showInForms)");	
-	$db->write("alter table groups add index groupName (groupName)");	
-	$db->write("alter table Product_feature add index assetId (assetId)");	
-	$db->write("alter table Product_benefit add index assetId (assetId)");	
-	$db->write("alter table Product_specification add index assetId (assetId)");	
-	$db->write("alter table DataForm_field add index assetId_tabId (assetId,DataForm_tabId)");	
-	$db->write("alter table Post add index threadId_rating (threadId, rating)");	
-}
-
-#-------------------------------------------------
-sub insertAutomaticLDAPRegistrationSetting {
-	my $session = shift;
-	print "\tAdding Automatic LDAP Registration setting to database.\n" unless ($quiet);
-
-	my ($hasSetting) = $session->db->quickArray('select name from settings where value=?', ['automaticLDAPRegistration']);
-
-	unless ($hasSetting) {
-		$session->db->write('insert into settings (name, value) values (?,?)', ['automaticLDAPRegistration', 0]);
-	}
-}
-
-#-------------------------------------------------
-sub changeGraphConfigColumnType {
-	my $session = shift;
-	print "\tFixing the the charts in the Poll asset (PLEASE SEE NOTES IN docs/gotcha.txt).\n" unless ($quiet);
-
-	$session->db->write('alter table Poll change column graphConfiguration graphConfiguration blob');
-}
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.1.3-7.2.0.pl b/docs/upgrades/upgrade_7.1.3-7.2.0.pl
deleted file mode 100644
index 5cf1c395b..000000000
--- a/docs/upgrades/upgrade_7.1.3-7.2.0.pl
+++ /dev/null
@@ -1,352 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Workflow;
-use WebGUI::AdSpace;
-
-my $toVersion = "7.2.0"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-addAdminModeSubnets($session);
-commerceSalesTax($session);
-createDictionaryStorage($session);
-addRssUrlMacroProcessing($session);
-addLastExportedAs($session);
-addDeletionWorkflows($session);
-addRSSFromParent($session);
-reorderSurveyCollateral($session);
-addNewProfileSetting($session);
-deleteFiles($session);
-fixAds($session);
-
-finish($session); # this line required
-
-#--------------------------------------------------
-sub addAdminModeSubnets {
-	my $session = shift;
-	print "\tAllowing admin mode to be restricted to certain subnets in the config file.\n" unless ($quiet);
-	$session->config->set("adminModeSubnets",[]);
-}
-
-#--------------------------------------------------
-sub addNewProfileSetting {
-	my $session = shift;
-	print "\tAdding new profile setting to force image only uploads on image form controls.\n" unless ($quiet);
-	$session->db->write("alter table userProfileField add column forceImageOnly int(11) default 1");
-}
-
-#--------------------------------------------------
-sub deleteFiles {
-	my $session = shift;
-	print "\tDelete unnecessary files.\n" unless ($quiet);
-	unlink "../../lib/WebGUI/i18n/English/Form_Textarea.pm";
-	unlink "../../www/extras/resizeable_textarea.js";
-}
-
-#--------------------------------------------------
-sub fixAds {
-	my $session = shift;
-	print "\tFixing ads so they work in IE.\n" unless ($quiet);
-	foreach my $adSpace (@{WebGUI::AdSpace->getAdSpaces($session)}) {
-		foreach my $ad (@{$adSpace->getAds}) {
-			$ad->set({});
-		}
-	}
-}
-
-#--------------------------------------------------
-sub addRssUrlMacroProcessing {
-	my $session = shift;
-	print "\tAdding option to process macros in a Syndicated Content RSS Url.\n" unless ($quiet);
-	$session->db->write("alter table SyndicatedContent add column processMacroInRssUrl int(11) default 0");
-}
-
-##-------------------------------------------------
-sub commerceSalesTax {
-	my $session = shift;
-	print "\tAdding tables and columns to support sales tax in the Commerce System.\n" unless ($quiet);
-	$session->db->write(<<EOS1);
-CREATE TABLE commerceSalesTax (commerceSalesTaxId varchar(22) NOT NULL, regionIdentifier varchar(50) NOT NULL, salesTax float NOT NULL, PRIMARY KEY (commerceSalesTaxId) ) ENGINE MyISAM DEFAULT CHARSET=utf8;
-EOS1
-	$session->db->write(<<EOS2);
-ALTER TABLE products
-ADD COLUMN useSalesTax INTEGER DEFAULT 0;
-EOS2
-	$session->db->write(<<EOS3);
-ALTER TABLE subscription
-ADD COLUMN useSalesTax INTEGER DEFAULT 0;
-EOS3
-	$session->db->write(<<EOS3);
-INSERT INTO settings (name,value) VALUES ('commerceEnableSalesTax','0');
-EOS3
-}
-
-#-------------------------------------------------
-sub createDictionaryStorage {
-	my $session = shift;
-	print "\tCreating the directory for the personal dictionaries.\n" unless ($quiet);
-
-	my $dictionaryDirectory = $session->config->get('uploadsPath') .'/dictionaries';
-
-	mkdir $dictionaryDirectory unless (-e $dictionaryDirectory);
-	mkdir $dictionaryDirectory.'/oldIds' unless (-e $dictionaryDirectory.'/oldIds');
-}
-
-#-------------------------------------------------
-sub addLastExportedAs {
-	my $session = shift;
-	print "\tAdding lastExportedAs field for assets.\n" unless $quiet;
-
-	$session->db->write($_) for(<<'EOT',
-  ALTER TABLE asset
-   ADD COLUMN lastExportedAs varchar(255) NULL DEFAULT NULL
-EOT
-				   );
-}
-
-#-------------------------------------------------
-sub addDeletionWorkflows {
-	my $session = shift;
-	print "\tAdding deletion workflows and activities.\n" unless $quiet;
-
-	my $nullAssetWorkflow = WebGUI::Workflow->create
-	    ($session, { type => "None",
-			 enabled => 1,
-			 description => "Does nothing extra.  Default for deletion workflow settings.",
-			 title => "Do Nothing on Deletion" },
-	     "DPWwf20061030000000001");
-	my $deleteExportsWorkflow = WebGUI::Workflow->create
-	    ($session, { type => "None",
-			 enabled => 1,
-			 description => "Deletes exported files from an asset being deleted or moved.",
-			 title => "Delete Exported Files" },
-	     "DPWwf20061030000000002");
-	my $deleteExportsActivity = $deleteExportsWorkflow->addActivity
-	    ("WebGUI::Workflow::Activity::DeleteExportedFiles", "DPWwfa2006103000000002");
-	$deleteExportsActivity->set('title', 'Delete Exported Files');
-
-	$session->db->write("INSERT INTO settings (name, value) VALUES (?, ?)", $_) for
-	    (['trashWorkflow', $nullAssetWorkflow->getId], ['purgeWorkflow', $nullAssetWorkflow->getId],
-	     ['changeUrlWorkflow', $nullAssetWorkflow->getId]);
-
-	my $activityHash = $session->config->get('workflowActivities');
-	push @{$activityHash->{None}}, 'WebGUI::Workflow::Activity::DeleteExportedFiles';
-	$session->config->set('workflowActivities', $activityHash);
-}
-
-
-#-------------------------------------------------
-sub addRSSFromParent {
-	my $session = shift;
-	print "\tAdding RSS From Parent capability.\n" unless $quiet;
-
-	$session->db->write($_) for (<<'EOT',
-  CREATE TABLE RSSFromParent (
-    assetId varchar(22) character set utf8 collate utf8_bin NOT NULL,
-    revisionDate bigint(20) NOT NULL,
-    PRIMARY KEY (assetId, revisionDate)
-  ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-EOT
-				     <<'EOT',
-  CREATE TABLE RSSCapable (
-    assetId varchar(22) character set utf8 collate utf8_bin NOT NULL,
-    revisionDate bigint(20) NOT NULL,
-    rssCapableRssEnabled int(11) NOT NULL DEFAULT 1,
-    rssCapableRssTemplateId varchar(22) character set utf8 collate utf8_bin NOT NULL
-                            DEFAULT 'PBtmpl0000000000000142',
-    rssCapableRssFromParentId varchar(22) character set utf8 collate utf8_bin NULL DEFAULT NULL,
-    PRIMARY KEY (assetId, revisionDate)
-  ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-EOT
-				    );
-
-	my $oldTag = WebGUI::VersionTag->getWorking($session, 0);
-
-	$session->db->write($_) for (<<'EOT',
-  UPDATE template
-     SET namespace = 'RSSCapable/RSS'
-   WHERE namespace = 'Collaboration/RSS'
-EOT
-				    );
-
-	WebGUI::Asset->newByDynamicClass($session, 'PBtmpl0000000000000142')
-					     ->update({ title => 'Default RSS', menuTitle => 'Default RSS' });
-
-	# Need to get the Collaborations, since those now have RSS capability.
-	$session->db->write($_) for (<<'EOT',
-  INSERT INTO RSSCapable (assetId, revisionDate, rssCapableRssEnabled, rssCapableRssTemplateId,
-                          rssCapableRssFromParentId)
-    SELECT assetId, revisionDate, 0, rssTemplateId, NULL
-      FROM Collaboration
-EOT
-				     <<'EOT',
-  ALTER TABLE Collaboration
-  DROP COLUMN rssTemplateId
-EOT
-				    );
-
-	my $csTag = WebGUI::VersionTag->create($session, { name => '7.2.0 Collaboration RSS update' });
-	$csTag->setWorking;
-	foreach my $csId ($session->db->buildArray("SELECT DISTINCT assetId FROM Collaboration")) {
-		# Blah, some duplication with RSSCapable.pm.
-		my ($revisionDate) = $session->db->quickArray("SELECT MAX(revisionDate) FROM Collaboration WHERE assetId = ?", [$csId]);
-		my $cs = WebGUI::Asset->newByDynamicClass($session, $csId, $revisionDate);
-		if ($cs->get('isPrototype') or not($cs->get('status') eq 'approved' or
-						   $cs->get('status') eq 'archived')) {
-			$cs->update({ rssCapableRssEnabled => 1, rssCapableRssFromParentId => undef });
-			if (!$cs->get('isPrototype')) {
-				# Update the most recent published one too.
-				my $csp = WebGUI::Asset->newByDynamicClass($session, $csId);
-				if ($csp) {
-					# Duplication with below.  x.o
-					my $rssFromParent =
-					    $csp->addChild({ className => 'WebGUI::Asset::RSSFromParent',
-							     title => $csp->get('title'),
-							     menuTitle => $csp->get('menuTitle'),
-							     url => $csp->get('url').'.rss' 
-							   });
-					$csp->update({ rssCapableRssEnabled => 1,
-						       rssCapableRssFromParentId => $rssFromParent->getId });
-				}
-			}
-		} else {
-			my $rssFromParent =
-			    $cs->addChild({ className => 'WebGUI::Asset::RSSFromParent',
-					    title => $cs->get('title'),
-					    menuTitle => $cs->get('menuTitle'),
-					    url => $cs->get('url').'.rss'
-					  });
-			$cs->update({ rssCapableRssEnabled => 1,
-				      rssCapableRssFromParentId => $rssFromParent->getId });
-		}
-	}
-	$csTag->commit;
-
-	$oldTag->setWorking if $oldTag;
-}
-
-##-------------------------------------------------
-sub reorderSurveyCollateral {
-	my $session = shift;
-	print "\tFixing ordering problems with Survey answers.\n" unless ($quiet);
-	# and here's our code
-	my $sth1 = $session->db->prepare("select distinct(assetId) from Survey");
-	my $sth2 = $session->db->prepare("select Survey_questionId from Survey_question where Survey_Id=?");
-	$sth1->execute();
-	while (my ($assetId) = $sth1->array) {  ##Iterate over all surveys
-		my $survey = WebGUI::Asset->new($session, $assetId, 'WebGUI::Asset::Wobject::Survey');
-		next unless defined $survey; # skip pending surveys
-		my $Survey_Id = $survey->get('Survey_id');
-		$sth2->execute([$Survey_Id]);
-		while (my ($questionId) = $sth2->array) { ##iterate over all questions in the survey
-			$session->errorHandler->warn($questionId);
-			$survey->reorderCollateral("Survey_answer", "Survey_answerId","Survey_questionId", $questionId);
-		}
-		$sth2->finish;
-	}
-	$sth1->finish;
-}
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.2.0-7.2.1.pl b/docs/upgrades/upgrade_7.2.0-7.2.1.pl
deleted file mode 100644
index 9b655b22e..000000000
--- a/docs/upgrades/upgrade_7.2.0-7.2.1.pl
+++ /dev/null
@@ -1,135 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.2.1"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-fixInOutBoardTable($session);
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-#-------------------------------------------------
-sub fixInOutBoardTable {
-	my $session = shift;
-	print "\tFixing InOutBoard table: Adding revisionDate column as a primary key.\n" unless ($quiet);
-	
-	$session->db->write("alter table InOutBoard drop primary key");
-	$session->db->write("alter table InOutBoard add primary key (assetId,revisionDate)");
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.2.1-7.2.2.pl b/docs/upgrades/upgrade_7.2.1-7.2.2.pl
deleted file mode 100644
index d52b66136..000000000
--- a/docs/upgrades/upgrade_7.2.1-7.2.2.pl
+++ /dev/null
@@ -1,141 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.2.2"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-addProfileFieldsOnRegistration($session);
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub addProfileFieldsOnRegistration {
-	my $session = shift;
-	print "\tAdding showAtRegistration to userProfileField rows.\n" unless $quiet;
-
-	$session->db->write($_) for(<<'EOT',
-  ALTER TABLE userProfileField
-   ADD COLUMN showAtRegistration int(11) NOT NULL default '0'
-EOT
-				    <<'EOT',
-  UPDATE userProfileField SET showAtRegistration = required
-EOT
-				   );
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.2.2-7.2.3.pl b/docs/upgrades/upgrade_7.2.2-7.2.3.pl
deleted file mode 100644
index f855033b9..000000000
--- a/docs/upgrades/upgrade_7.2.2-7.2.3.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.2.3"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.2.3-7.3.0.pl b/docs/upgrades/upgrade_7.2.3-7.3.0.pl
deleted file mode 100644
index b07739229..000000000
--- a/docs/upgrades/upgrade_7.2.3-7.3.0.pl
+++ /dev/null
@@ -1,473 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Workflow;
-use WebGUI::International;
-
-my $toVersion = "7.3.0"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-addWikiAssets($session);
-deleteOldFiles($session);
-addFileFieldsToDataForm($session);
-makeRSSFromParentAlwaysHidden($session);
-addProfileFieldsOnPasswordRecovery($session);
-addEmailValidationExpiry($session);
-addNewCalendar($session);
-migrateCalendars($session);
-removeOldCalendar($session);
-fixCommerceTemplateSettings($session);
-finish($session); # this line required
-
-#-------------------------------------------------
-sub addFileFieldsToDataForm {
-	my $session = shift;
-	print "\tAdding File Field Types to the Data Form Wobject\n" unless $quiet;
-	$session->db->write("alter table DataForm add column (mailAttachments int(11) default 0)");
-}
-
-#-------------------------------------------------
-sub deleteOldFiles {
-	my $session = shift;
-	print "\tDeleting old unneeded files.\n" unless $quiet;
-	unlink "../../www/extras/assets/wiki.gif";
-	unlink "../../www/extras/assets/wikiPost.gif";
-	unlink "../../www/extras/assets/small/wiki.gif";
-	unlink "../../www/extras/assets/small/wikiPost.gif";
-}
-
-#-------------------------------------------------
-sub addWikiAssets {
-	my $session = shift;
-	print "\tAdding wiki assets.\n" unless $quiet;
-
-	$session->db->write($_) for(<<'EOT',
-  CREATE TABLE `WikiMaster` (
-    `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL,
-    `revisionDate` bigint(20) NOT NULL,
-    `groupToEditPages` varchar(22) character set utf8 collate utf8_bin NOT NULL default '2',
-    `groupToAdminister` varchar(22) character set utf8 collate utf8_bin NOT NULL default '3',
-    `richEditor` varchar(22) character set utf8 collate utf8_bin NOT NULL
-                 default 'PBrichedit000000000002',
-    `frontPageTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
-                          default 'WikiFrontTmpl000000001',
-    `pageTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
-                     default 'WikiPageTmpl0000000001',
-    `pageEditTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
-                         default 'WikiPageEditTmpl000001',
-    `recentChangesTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL default 'WikiRCTmpl000000000001',
-    `mostPopularTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL default 'WikiMPTmpl000000000001',
-    `pageHistoryTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
-                            default 'WikiPHTmpl000000000001',
-    `searchTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
-                       default 'WikiSearchTmpl00000001',
-    `recentChangesCount` int(11) NOT NULL default 50,
-    `recentChangesCountFront` int(11) NOT NULL default 10,
-    `mostPopularCount` int(11) NOT NULL default 50,
-    `mostPopularCountFront` int(11) NOT NULL default 10,
-    `thumbnailSize` int(11) NOT NULL default 0,
-    `maxImageSize` int(11) NOT NULL default 0,
-	`approvalWorkflow` varchar(22) binary not null default 'pbworkflow000000000003',
-    PRIMARY KEY (`assetId`, `revisionDate`)
-  ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-EOT
-				    <<'EOT',
-  CREATE TABLE `WikiPage` (
-    `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL,
-    `revisionDate` bigint(20) NOT NULL,
-    `content` mediumtext,
-    `storageId` varchar(22) character set utf8 collate utf8_bin NULL,
-    `views` bigint(20) NOT NULL default 0,
-	isProtected int not null default 0,
-	actionTaken varchar(35) not null,
-	actionTakenBy varchar(22) binary not null,
-    PRIMARY KEY (`assetId`, `revisionDate`)
-  ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-EOT
-				   );
-
-	$session->config->addToArray('assets', 'WebGUI::Asset::Wobject::WikiMaster');
-}
-
-#-----------------------------------------------------
-sub makeRSSFromParentAlwaysHidden {
-	my $session = shift;
-	print "\tHiding RSS From Parent assets.\n" unless $quiet;
-
-	# Since it's internal anyway, might as well just do it directly to all the revisions.
-	$session->db->write($_) for(<<'EOT',
-  UPDATE assetData AS d INNER JOIN RSSFromParent AS r
-                                ON d.assetId = r.assetId AND d.revisionDate = r.revisionDate
-     SET d.isHidden = 1
-EOT
-				   );
-}
-
-#-------------------------------------------------
-sub addNewCalendar {
-	my $session = shift;
-	my $i18n = WebGUI::International->new($session,'Asset_Calendar');
-	print "\tCreating Calendar and Event tables.\n" unless $quiet;
-	
-	$session->db->write($_) for (<<'ENDSQL',
-CREATE TABLE `Event` (
-  `assetId` varchar(22) NOT NULL, 
-  `revisionDate` bigint(20) unsigned NOT NULL,
-  `feedId` varchar(22) default NULL,
-  `feedUid` varchar(255) default NULL,
-  `startDate` date default NULL,
-  `endDate` date default NULL,
-  `userDefined1` text,
-  `userDefined2` text,
-  `userDefined3` text,
-  `userDefined4` text,
-  `userDefined5` text,
-  `recurId` varchar(22) default NULL,
-  `description` longtext,
-  `startTime` time default NULL,
-  `endTime` time default NULL,
-  `relatedLinks` longtext,
-  `location` varchar(255) default NULL,
-  PRIMARY KEY  (`assetId`,`revisionDate`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
-ENDSQL
-		<<'ENDSQL',
-CREATE TABLE `Calendar` (
-  `assetId` varchar(22) NOT NULL,
-  `revisionDate` bigint(20) unsigned NOT NULL default '0',
-  `defaultDate` enum('current','first','last') default "current",
-  `defaultView` enum('month','week','day') default "month",
-  `visitorCacheTimeout` int(11) unsigned default NULL,
-  `templateIdMonth` varchar(22) default "CalendarMonth000000001",
-  `templateIdWeek` varchar(22) default "CalendarWeek0000000001",
-  `templateIdDay` varchar(22) default "CalendarDay00000000001",
-  `templateIdEvent` varchar(22) default "CalendarEvent000000001",
-  `templateIdEventEdit` varchar(22) default "CalendarEventEdit00001",
-  `templateIdSearch` varchar(22) default "CalendarSearch00000001",
-  `templateIdPrintMonth` varchar(22) default "CalendarPrintMonth0001",
-  `templateIdPrintWeek` varchar(22) default "CalendarPrintWeek00001",
-  `templateIdPrintDay` varchar(22) default "CalendarPrintDay000001",
-  `templateIdPrintEvent` varchar(22) default "CalendarPrintEvent0001",
-  `groupIdEventEdit` varchar(22) default "3",
-  `groupIdSubscribed` varchar(22) default NULL,
-  `subscriberNotifyOffset` int(11) default NULL,
-  PRIMARY KEY  (`assetId`,`revisionDate`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
-ENDSQL
-		<<'ENDSQL',
-CREATE TABLE `Event_recur` (
-  `recurId` varchar(22) NOT NULL,
-  `recurType` varchar(16) default NULL,
-  `pattern` varchar(255) default NULL,
-  `startDate` date default NULL,
-  `endDate` varchar(10) default NULL,
-  PRIMARY KEY  (`recurId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
-ENDSQL
-		<<'ENDSQL',
-CREATE TABLE `Calendar_feeds` (
-  `feedId` varchar(22) NOT NULL,
-  `assetId` varchar(22) NOT NULL,
-  `url` varchar(255) NOT NULL,
-  `lastUpdated` int(16) default NULL,
-  `lastResult` varchar(255) default NULL,
-  `feedType` varchar(30) NOT NULL,
-  PRIMARY KEY  (`feedId`,`assetId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-ENDSQL
-);
-	
-	$session->config->addToArray('assets', 'WebGUI::Asset::Wobject::Calendar');
-	
-	my $workflows = $session->config->get("workflowActivities");
-	push @{$workflows->{None}},"WebGUI::Workflow::Activity::CalendarUpdateFeeds";
-	$session->config->set("workflowActivities",$workflows);
-	
-	# Add the Calendar Update Feeds activity to Hourly Maintenance workflow
-	my $workflow = WebGUI::Workflow->new($session,"pbworkflow000000000004");
-	my $activity = $workflow->addActivity("WebGUI::Workflow::Activity::CalendarUpdateFeeds");
-	$activity->set("title", $i18n->get("workflow updateFeeds"));
-	$activity->set("description", $i18n->get("workflow updateFeeds description"));	
-}
-
-#-------------------------------------------------
-sub migrateCalendars {
-	my $session	= shift;
-	
-	print "\tMigrating EventsCalendar to Calendar wobjects.\n" unless $quiet;
-	use WebGUI::DateTime;
-	
-	# For every EventsCalendar
-	#EventsCalendar.defaultMonth = Calendar.defaultDate
-	my $calendars	= WebGUI::Asset->getRoot($session)->getLineage(['descendants'],
-		{
-            statesToInclude     => ['published','trash','clipboard','clipboard-limbo','trash-limbo'],
-            statusToInclude     => ['pending','approved','deleted','archived'],
-			includeOnlyClasses	=> ['WebGUI::Asset::Wobject::EventsCalendar'],
-			returnObjects		=> 1,
-		});
-
-	for my $asset (@{$calendars})
-	{
-		next unless defined $asset;
-        
-        # If the asset is in the trash, ignore the migration, we're just going
-        # to purge it.
-        if ($asset->get("state") =~ m/trash/) {
-            next;
-        }
-
-
-		my $properties	= {%{$asset->get}};
-		#warn "Found calendar ".$properties->{title};
-		$properties->{defaultDate}	    = delete $properties->{defaultMonth};
-		$properties->{className}	    = "WebGUI::Asset::Wobject::Calendar";
-        $properties->{groupIdEventEdit} = $properties->{groupIdEdit};
-
-		# Add the new asset
-		my $newAsset = $asset->getParent->addChild($properties);
-		#warn "Added Calendar ".$newAsset->get("title")." ".$newAsset->get("className");
-	    
-		# Get this calendar's events and change to new parent
-		my $events	= $asset->getLineage(['descendants'],
-			{
-                statesToInclude     => ['published','trash','clipboard','clipboard-limbo','trash-limbo'],
-                statusToInclude     => ['pending','approved','deleted','archived'],
-				includeOnlyClasses	=> ['WebGUI::Asset::Event'],
-			});
-		#warn "Got lineage";
-		
-		
-		for my $event (@{$events}) {
-			#warn "Got event: $event";
-			
-			# Add a child to the new calendar using the properties 
-			# from EventsCalendar_event
-            my %eventProperties = $session->db->quickHash("
-                    select
-                            *
-                    from
-                            asset
-                    left join
-                            assetData on asset.assetId=assetData.assetId
-                    left join
-                            EventsCalendar_event on asset.assetId = EventsCalendar_event.assetId and assetData.revisionDate=EventsCalendar_event.revisionDate
-                    where
-                            asset.assetId = ? 
-                            and assetData.revisionDate=(
-                                    select
-                                            max(revisionDate)
-                                    from assetData
-                                    where assetData.assetId=asset.assetId
-                                    and (status='approved' or status='archived')
-                            )
-                    ",[$event]);
-			delete $eventProperties{assetId};
-			
-			my ($startDate, $startTime) = split / /, WebGUI::DateTime->new(delete $eventProperties{eventStartDate})->toMysql;
-			my ($endDate, $endTime) = split / /, WebGUI::DateTime->new(delete $eventProperties{eventEndDate})->toMysql;
-			
-			$eventProperties{startDate} 	= $startDate;
-			$eventProperties{startTime} 	= $startTime;
-			$eventProperties{endDate} 	= $endDate;
-			$eventProperties{endTime} 	= $endTime;
-			#use Data::Dumper;
-			#warn Dumper \%eventProperties;
-			
-            $newAsset->addChild(\%eventProperties,undef,undef,{skipAutoCommitWorkflows=>1});
-
-			# Remove this event from the old calendar
-			$session->db->write("delete from EventsCalendar_event where assetId=?",[$event]);
-			$session->db->write("delete from asset where assetId=?",[$event]);
-			$session->db->write("delete from assetData where assetId=?",[$event]);
-			$session->db->write("delete from assetIndex where assetId=?",[$event]);
-			$session->db->write("delete from assetHistory where assetId=?",[$event]);
-		}
-		#warn "Set parents on events";
-		
-		
-        # Save the old Calendar's URL so we can fix it
-        my $fixUrl = $asset->get("url");
-		
-        # Remove the old asset
-		$asset->purge;
-		#warn "Purged old calendar";
-        
-        # Fix the new Calendar's URL
-        $newAsset->update({ url => $fixUrl });
-	}
-}
-
-#-------------------------------------------------
-sub removeOldCalendar {
-	my $session	= shift;
-	print "\tRemoving old EventsCalendar tables, templates, .\n" unless $quiet;
-	
-	# Remove tables
-	$session->db->write("drop table EventsCalendar");
-	$session->db->write("drop table EventsCalendar_event");
-	
-	# Remove Plainblack's EventsCalendar / Events templates
-	#PBtmpl0000000000000022
-	WebGUI::Asset->newByDynamicClass($session,"PBtmpl0000000000000022")->purge;
-	#PBtmpl0000000000000023
-	WebGUI::Asset->newByDynamicClass($session,"PBtmpl0000000000000023")->purge;
-	
-	$session->config->deleteFromArray("assets","WebGUI::Asset::Wobject::EventsCalendar");
-}
-
-#-------------------------------------------------
-sub addProfileFieldsOnPasswordRecovery {
-	my $session = shift;
-	print "\tAdding requiredForPasswordRecovery to userProfileField rows.\n" unless $quiet;
-	$session->db->write($_) for(<<'EOT',
-  ALTER TABLE userProfileField
-   ADD COLUMN requiredForPasswordRecovery int(11) NOT NULL default '0'
-EOT
-				   );
-
-	$session->setting->set('webguiPasswordRecovery', 0);
-	$session->setting->add('webguiPasswordRecoveryRequireUsername', 1);
-	$session->setting->set('webguiPasswordRecoveryTemplate', 'PBtmpl0000000000000014');
-}
-
-#-------------------------------------------------
-sub addEmailValidationExpiry {
-	my $session = shift;
-	print "\tAdding email validation expiry.\n" unless $quiet;
-
-	# Remove email activation keys for active users so that if they deactivate themselves
-	# in the future the workflow activity doesn't treat them as deleted.
-	$session->db->write($_) for (<<'EOT',
-  DELETE FROM authentication
-        WHERE fieldName = 'emailValidationKey' AND
-              (SELECT status FROM users AS u WHERE u.userId = userId) = 'Active'
-EOT
-				    );
-
-	my $activities = $session->config->get('workflowActivities');
-	my $class = 'WebGUI::Workflow::Activity::ExpireUnvalidatedEmailUsers';
-	@{$$activities{None}} = ((grep{$_ ne $class} @{$$activities{None}}), $class);
-	$session->config->set('workflowActivities', $activities);
-}
-
-#-------------------------------------------------
-sub fixCommerceTemplateSettings {
-	my $session = shift;
-	print "\tFixing up commerce template settings.\n" unless $quiet;
-	foreach my $spec (['commerceConfirmCheckoutTemplateId', 'PBtmpl0000000000000016'],
-			  ['commerceCheckoutCanceledTemplateId', 'PBtmpl0000000000000015'],
-			  ['commercePurchaseHistoryTemplateId', 'PBtmpl0000000000000019'],
-			  ['commerceSelectShippingMethodTemplateId', 'PBtmplCSSM000000000001'],
-			  ['commerceSelectPaymentGatewayTemplateId', 'PBtmpl0000000000000017'],
-			  ['commerceViewShoppingCartTemplateId', 'PBtmplVSC0000000000001'],
-			  ['commerceTransactionErrorTemplateId', 'PBtmpl0000000000000018']) {
-		my ($name, $value) = @$spec;
-		if ($session->setting->get($name) eq '1') {
-			$session->setting->set($name, $value);
-		}
-	}
-}
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.{0,22})$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create && !WebGUI::Asset->newByDynamicClass($session,$properties{id})) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.0-7.3.1.pl b/docs/upgrades/upgrade_7.3.0-7.3.1.pl
deleted file mode 100644
index ae2b8f7d6..000000000
--- a/docs/upgrades/upgrade_7.3.0-7.3.1.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.1"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-
-finish($session); # this line required
-
-#-------------------------------------------------
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.1-7.3.2.pl b/docs/upgrades/upgrade_7.3.1-7.3.2.pl
deleted file mode 100644
index 5e556966f..000000000
--- a/docs/upgrades/upgrade_7.3.1-7.3.2.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.2"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.10-7.3.11.pl b/docs/upgrades/upgrade_7.3.10-7.3.11.pl
deleted file mode 100644
index 305b4accd..000000000
--- a/docs/upgrades/upgrade_7.3.10-7.3.11.pl
+++ /dev/null
@@ -1,126 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.11"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-fixWeather($session);
-
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub fixWeather {
-	my $session = shift;
-	print "\tConverting WeatherData asset to use weather.com\n" unless ($quiet);
-	$session->db->write("alter table WeatherData add column partnerId varchar(100)");
-	$session->db->write("alter table WeatherData add column licenseKey varchar(100)");
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.11-7.3.12.pl b/docs/upgrades/upgrade_7.3.11-7.3.12.pl
deleted file mode 100644
index e397f0deb..000000000
--- a/docs/upgrades/upgrade_7.3.11-7.3.12.pl
+++ /dev/null
@@ -1,133 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.12"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-deleteUnusedIcalFeeds($session);
-
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub deleteUnusedIcalFeeds {
-	my $session = shift;
-	print "\tDeleting iCal feeds for Calendar that have already been deleted.\n" unless ($quiet);
-    my $calendarAssetIds = $session->db->buildArrayRef('select distinct(assetId) from Calendar');
-    return unless scalar @{ $calendarAssetIds };
-    my $query = sprintf(
-            "DELETE FROM Calendar_feeds WHERE assetId NOT IN (%s)",
-            $session->db->quoteAndJoin($calendarAssetIds)
-        );
-    print $query;
-    $session->db->write($query);
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.12-7.3.13.pl b/docs/upgrades/upgrade_7.3.12-7.3.13.pl
deleted file mode 100644
index 460044dcb..000000000
--- a/docs/upgrades/upgrade_7.3.12-7.3.13.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.13"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.13-7.3.14.pl b/docs/upgrades/upgrade_7.3.13-7.3.14.pl
deleted file mode 100644
index 4259ad7f8..000000000
--- a/docs/upgrades/upgrade_7.3.13-7.3.14.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.14"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.14-7.3.15.pl b/docs/upgrades/upgrade_7.3.14-7.3.15.pl
deleted file mode 100644
index 876d6da84..000000000
--- a/docs/upgrades/upgrade_7.3.14-7.3.15.pl
+++ /dev/null
@@ -1,141 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.15"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-addEmsSessionPurchaseTable($session);
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-#----------------------------------------------------------------------------
-
-sub addEmsSessionPurchaseTable {
-    my $session     = shift;
-    print "\tAdding EMS Session-to-purchase reference table..."; 
-    $session->db->write(
-        "CREATE TABLE IF NOT EXISTS EventManagementSystem_sessionPurchaseRef (
-            sessionId VARCHAR(22) BINARY,
-            purchaseId VARCHAR(22) BINARY,
-            badgeId VARCHAR(22) BINARY,
-            PRIMARY KEY (sessionId, purchaseId, badgeId)
-        )"
-    );
-    print "OK!\n";
-}
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.15-7.3.16.pl b/docs/upgrades/upgrade_7.3.15-7.3.16.pl
deleted file mode 100644
index 0768b6092..000000000
--- a/docs/upgrades/upgrade_7.3.15-7.3.16.pl
+++ /dev/null
@@ -1,292 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.16"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-trackEmails($session);
-fixCss($session);
-
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub trackEmails {
-	my $session = shift;
-	print "\tTrack email messages for future debugging purposes.\n" unless ($quiet);
-    $session->db->write("alter table Post add column originalEmail mediumtext");
-}
-
-#-------------------------------------------------
-sub fixCss {
-	my $session = shift;
-	print "\tFixing default css 03 template.\n" unless ($quiet);
-    my $css = <<STOP;
-body, html {
-        margin:0px;
-        background-color:#b53018;
-        padding:0px;
-}
-body a {
-        color:#EE963E;font-weight:bold;
- letter-spacing:1px;
- font-size:8pt;
-}
-#main {
-        width:98%;
-        /*min-width:790px;*/
-        margin:0px;
-        padding:0px;
-        padding-top:20px;
-        padding-bottom:20px;
-        position:relative;
-}
-#header { 
-        background: url('^FileUrl(style3/header_bg.jpg);') repeat-x;
-        width:100%;
-        margin:0px;
-        height:115px;
-}
-#headerTitle {
-        background: url('^FileUrl(style3/header_left.jpg);') no-repeat left top;
-        height:100%;
-        width:100%;
-}
-#headerRight {
-        background: url('^FileUrl(style3/header_right.jpg);') no-repeat right top;
-        width:100%;
-        height:100%;
-        text-align:right;
-        position:relative;
-}
-#headerRight #title {
-        position:absolute;
-        top:25px;
-        left:20px;
-        font-family:arial;
-        text-align:left;
-}
-#title h1 {
-        text-transform:uppercase;
-        margin-bottom:0px;
-        font-weight:normal;
-        font-size:26pt;
-        margin-top:0px;
-        color:white;
-}
-#title h1 a {
-        color:white;
-        text-decoration:none; font-size: 26pt; font-weight: normal; 
-}
-#title h2 {
-        margin:0px;
-        font-size:12pt;
-        color:#bebebe;
-        padding-left:20px;
-}
-#title img {
-        z-index:5;
-}
-#login {
-        position:absolute;
-        font-size:8pt;
-        top:45%;
-        right:150px;
-        color:white;
-        z-index:6;
-        font-family:arial;
-}
-#login a {
-        color:white; font-weight: normal; letter-spacing: 0px;
-}
-.loginBox {
-        font-size:8pt;
-        margin:0px;
-        display:inline;
-}
-.loginBox input {
-        font-size:8pt;
-}
-
-#mainBody {
-        width:100%;
-        margin:0px;
-        height:500px;
-        background: #fff;
-        position:relative;
-	z-index:0;
-}
-#main > #mainBody {
-        height:auto;
-        min-height:500px;
-}
-#contentArea {
-        z-index:2;
-        position:relative;
-        padding-top:50px;
-        padding-left:10px;
-        padding-right:20px;
-        padding-bottom:20px;
-        -moz-box-sizing:border-box;
-        font-family:verdana;
-        font-size:9pt;
-
-}
-html #main #mainBody #contentArea {
-        height:1%;
-}
-#topCorner {
-        width:100%;
-        height:214px;
-        position:absolute;
-        top:0px;
-        left:0px;
-        background: url('^FileUrl(style3/main_top_bg.jpg);') repeat-x;
-        z-index:1;
-}
-#bottomCorner {
-        width:100%;
-        height:211px;
-        position:absolute;
-        bottom:59px;
-        right:0px;
-        background: url('^FileUrl(style3/main_bottom.jpg);') no-repeat right;
-        z-index:1;
-}
-* html #bottomCorner {
-	bottom:58px;
-}
-
-#footer {
-        width:100%;
-        margin:0px;
-        background:#000 url('^FileUrl(style3/footer_right.jpg);') no-repeat right top;
-        height:57px;
-        border-top:solid #B53018 2px;
-        text-align:right;
-        position:relative;
-		z-index:0;
-}
-#footer #copyright {
-        color:#3b3b3b;
-        font-family:arial;
-        position:absolute;
-        top:20px;
-        left:30px;
-        font-size:8pt;
-}
-
-STOP
-    my $asset = WebGUI::Asset->new($session, "7.0-style0000000000051", "WebGUI::Asset::Snippet");
-    if (defined $asset) {
-            $asset->addRevision({snippet=>$css});
-    }
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.16-7.3.17.pl b/docs/upgrades/upgrade_7.3.16-7.3.17.pl
deleted file mode 100644
index c57e37d60..000000000
--- a/docs/upgrades/upgrade_7.3.16-7.3.17.pl
+++ /dev/null
@@ -1,141 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.17"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-addStorageTranslation($session);
-
-finish($session); # this line required
-
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-#----------------------------------------------------------------------------
-
-sub addStorageTranslation {
-    my $session     = shift;
-    print "\tAdding Storage Translation Table..."; 
-    $session->db->write(
-        "CREATE TABLE IF NOT EXISTS storageTranslation (
-            guidValue VARCHAR(22) BINARY,
-            hexValue VARCHAR(32) BINARY,
-            PRIMARY KEY (guidValue)
-        )"
-    );
-    print "OK!\n";
-}
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.17-7.3.18.pl b/docs/upgrades/upgrade_7.3.17-7.3.18.pl
deleted file mode 100644
index 5a4cad105..000000000
--- a/docs/upgrades/upgrade_7.3.17-7.3.18.pl
+++ /dev/null
@@ -1,163 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.18"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-fixEmsBadges($session);
-
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub fixEmsBadges {
-	my $session = shift;
-	print "\tAttaching EMS Badges to their EMS.\n" unless ($quiet);
-    my $db = $session->db;
-    # give tables an asset id that should have it
-    $db->write("alter table EventManagementSystem_badges add column assetId varchar(22) binary");
-    $db->write("alter table EventManagementSystem_prerequisites add column assetId varchar(22) binary");
-    $db->write("alter table EventManagementSystem_registrations add column assetId varchar(22) binary");
-    my $sth = $db->read("select badgeId,asset.assetId from EventManagementSystem_badges
-        left join EventManagementSystem_registrations using (badgeId) left join EventManagementSystem_products using
-        (productId) left join asset on (asset.assetId=EventManagementSystem_products.assetId);");
-    while (my ($badgeId, $assetId) = $sth->array) {
-        $db->write("update EventManagementSystem_badges set assetId=? where badgeId=?", [$assetId, $badgeId]);
-        $db->write("update EventManagementSystem_registrations set assetId=? where badgeId=?", [$assetId, $badgeId]);
-    }
-    my $sth = $db->read("select EventManagementSystem_prerequisites.prerequisiteId,
-        EventManagementSystem_products.assetId from EventManagementSystem_prerequisites left join
-        EventManagementSystem_prerequisiteEvents using (prerequisiteId) left join EventManagementSystem_products on
-        (EventManagementSystem_products.productId=EventManagementSystem_prerequisiteEvents.requiredProductId)");
-    while (my ($prereqId, $assetId) = $sth->array) {
-        $db->write("update EventManagementSystem_prerequisites set assetId=? where prerequisiteId=?", [$prereqId,
-            $assetId]); 
-    }
-
-    # delete badge data for which there is no asset
-    $db->write("delete from EventManagementSystem_badges where assetId is null");
-    $db->write("delete from EventManagementSystem_registrations where assetId is null");
-    # delete field data for which there is no asset
-    my $sth = $db->read("select EventManagementSystem_metaField.fieldId
-        from EventManagementSystem_metaField left join asset on
-        (EventManagementSystem_metaField.assetId=asset.assetId) where asset.assetId is null");
-    while (my ($fieldId) = $sth->array) {
-        $db->write("delete from EventManagementSystem_metaData where fieldId=?",[$fieldId]);
-        $db->write("delete from EventManagementSystem_metaField where fieldId=?",[$fieldId]);
-    }
-    # delete prereqs for which there is no asset
-    my $sth = $db->read("select EventManagementSystem_prerequisites.prerequisiteId from
-        EventManagementSystem_prerequisites left join asset using (assetId) where asset.assetId is null");
-    while (my ($id) = $sth->array) {
-        $db->write("delete from EventManagementSystem_prerequisites where prerequisiteId=?",[$id]);
-        $db->write("delete from EventManagementSystem_prerequisiteEvents where prerequisiteId=?",[$id]);
-    }
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.18-7.3.19.pl b/docs/upgrades/upgrade_7.3.18-7.3.19.pl
deleted file mode 100644
index fc7e0a35a..000000000
--- a/docs/upgrades/upgrade_7.3.18-7.3.19.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.19"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.19-7.4.0.pl b/docs/upgrades/upgrade_7.3.19-7.4.0.pl
index 26930af14..14640b7d6 100644
--- a/docs/upgrades/upgrade_7.3.19-7.4.0.pl
+++ b/docs/upgrades/upgrade_7.3.19-7.4.0.pl
@@ -12,7 +12,7 @@ use lib "../../lib";
 use strict;
 use Getopt::Long;
 use WebGUI::Session;
-
+use WebGUI::Workflow;
 
 my $toVersion = "7.4.0"; # make this match what version you're going to
 my $quiet; # this line required
@@ -20,7 +20,7 @@ my $quiet; # this line required
 
 my $session = start(); # this line required
 
-# upgrade functions go here
+addRealtimeWorkflow($session);
 addGroupingsIndexOnUserId($session);
 fixProfileDataWithoutFields($session);
 buildNewUserProfileTable($session);
@@ -29,12 +29,32 @@ addAttachmentsToEvents($session);
 finish($session); # this line required
 
 
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
+#-------------------------------------------------
+sub addRealtimeWorkflow {
+	my $session = shift;
+	print "\tAdding realtime workflow option.\n" unless ($quiet);
+    my $db = $session->db;
+    $db->write("alter table Workflow add column mode varchar(20) not null default 'parallel'");
+    my $sth = $db->read("select workflowId, isSerial from Workflow where isSerial=1 or isSingleton=1");
+    while (my ($id, $serial) = $sth->array) {
+        my $mode = "singleton";
+        $mode = "serial" if ($serial);
+        $db->write("update Workflow set mode=? where workflowId=?",[$mode, $id]);
+    }
+    $db->write("alter table Workflow drop column isSingleton");
+    $db->write("alter table Workflow drop column isSerial");
+    my $workflow = WebGUI::Workflow->create($session, {
+        enabled     => 1,
+        title       => "Commit Content Immediately",
+        description => "Will commit the content as soon as save is pressed rather than waiting for Spectre to pick it up and run it in the background.",
+        mode        => "realtime",
+        type        => "WebGUI::VersionTag",
+        },"realtimeworkflow-00001");
+    my $activity = $workflow->addActivity("WebGUI::Workflow::Activity::CommitVersionTag", "pb-commitimmediately01");
+    $activity->set("title", "Commit Version Tag"); 
+    $session->setting->add("autoRequestCommit",0);
+    $session->setting->add("skipCommitComments",0);
+}
 
 #----------------------------------------------------------------------------
 
diff --git a/docs/upgrades/upgrade_7.3.2-7.3.3.pl b/docs/upgrades/upgrade_7.3.2-7.3.3.pl
deleted file mode 100644
index 4a7896145..000000000
--- a/docs/upgrades/upgrade_7.3.2-7.3.3.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.3"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.3-7.3.4.pl b/docs/upgrades/upgrade_7.3.3-7.3.4.pl
deleted file mode 100644
index bbd6a679a..000000000
--- a/docs/upgrades/upgrade_7.3.3-7.3.4.pl
+++ /dev/null
@@ -1,127 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.4"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-fixWiki($session);
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-sub fixWiki {
-	my $session = shift;
-	print "\tImplementing replacements and content filtering for the Wiki Wobject.\n" unless ($quiet);
-	
-	$session->db->write("alter table WikiMaster add column useContentFilter int(11) default 0");
-	$session->db->write("alter table WikiMaster add column filterCode varchar(30) default 'javascript'");
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.4-7.3.5.pl b/docs/upgrades/upgrade_7.3.4-7.3.5.pl
deleted file mode 100644
index d6de5fe11..000000000
--- a/docs/upgrades/upgrade_7.3.4-7.3.5.pl
+++ /dev/null
@@ -1,134 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Asset;
-use WebGUI::Asset::Snippet;
-
-
-my $toVersion = "7.3.5"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-fixCss03Snippet($session);
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub fixCss03Snippet {
-	my $session = shift;
-	print "\tFixing the css03.css file used in Style03.\n" unless ($quiet);
-	my $cssSnippet = WebGUI::Asset->newByUrl($session, 'style3/css03.css');
-	if (ref $cssSnippet ne 'WebGUI::Asset::Snippet') {
-		print "Snippet could not be found.  Skipping";
-		return;
-	}
-	my $snippetContents = $cssSnippet->get('snippet');
-	$snippetContents =~ s/-moz-box-sizing:border:box/-moz-box-sizing:border-box/s;
-	$cssSnippet->update({snippet => $snippetContents});
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.5-7.3.6.pl b/docs/upgrades/upgrade_7.3.5-7.3.6.pl
deleted file mode 100644
index 0b85c59cc..000000000
--- a/docs/upgrades/upgrade_7.3.5-7.3.6.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.6"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-optimizeDb($session);
-
-finish($session); # this line required
-
-
-#-------------------------------------------------
-sub optimizeDb {
-	my $session = shift;
-	print "\tOptimizing database.\n" unless ($quiet);
-	$session->db->write("alter table assetData add index assetId_status_tagId_revisionDate (assetId,status,tagId,revisionDate)");
-}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.6-7.3.7.pl b/docs/upgrades/upgrade_7.3.6-7.3.7.pl
deleted file mode 100644
index 5fb587196..000000000
--- a/docs/upgrades/upgrade_7.3.6-7.3.7.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.7"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.7-7.3.8.pl b/docs/upgrades/upgrade_7.3.7-7.3.8.pl
deleted file mode 100644
index b22f9d451..000000000
--- a/docs/upgrades/upgrade_7.3.7-7.3.8.pl
+++ /dev/null
@@ -1,170 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.8"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-removeOrphanedEventsCalendars($session);
-removeOrphanedEvents($session);
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-##-------------------------------------------------
-sub removeOrphanedEventsCalendars {
-    my $session     = shift;
-    print "\tRemoving orphaned Events Calendars... ";
-
-    # Remove Events Calendars from asset, assetData, assetIndex, wobject
-    my @assetIds 
-        = $session->db->buildArray(
-            qq{select assetId from asset where className="WebGUI::Asset::Wobject::EventsCalendar"}
-        );
-
-    for my $assetId (@assetIds) {
-        for my $table (qw( assetData assetIndex wobject asset )) {
-            $session->db->write("delete from $table where assetId=?",[$assetId]);
-        }
-    }
-
-    print "OK!\n";
-}
-
-
-
-##-------------------------------------------------
-sub removeOrphanedEvents {
-    my $session     = shift;
-    print "\tRemoving orphaned Events... ";
-
-    # Remove Events from asset, assetData, assetIndex that do not exist in the Event table
-    my @assetIds 
-        = $session->db->buildArray(
-            qq{select assetId from asset where className="WebGUI::Asset::Event" }
-            . qq{and assetId NOT IN (select assetId from Event)}
-        );
-
-    for my $assetId (@assetIds) {
-        for my $table (qw( assetData assetIndex asset )) {
-            $session->db->write("delete from $table where assetId=?",[$assetId]);
-        }
-    }
-    
-
-    print "OK!\n";
-}
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.8-7.3.9.pl b/docs/upgrades/upgrade_7.3.8-7.3.9.pl
deleted file mode 100644
index f14c1685e..000000000
--- a/docs/upgrades/upgrade_7.3.8-7.3.9.pl
+++ /dev/null
@@ -1,166 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Asset;
-
-
-my $toVersion = "7.3.9"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-fixCalendarFeedsLastUpdatedField($session);
-addThreadRatingColumn($session);
-addSkipNotificationColumn($session);
-updateTemplates($session);
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-
-##-------------------------------------------------
-sub fixCalendarFeedsLastUpdatedField {
-    my $session = shift;
-    print "\tFixing Calendar Feeds lastUpdated field.\n" unless ($quiet);
-    $session->db->write("alter table Calendar_feeds modify column lastUpdated datetime");
-}
-
-##-------------------------------------------------
-sub addThreadRatingColumn {
-    my $session = shift;
-    print "\tAdding Thread rating column\n" unless ($quiet);
-    $session->db->write("alter table Thread add column threadRating integer default 0");
-    my $root = WebGUI::Asset->getRoot($session);
-    my $threads = $root->getLineage(
-    	['descendants'],
-        {
-            returnObjects      => 1,
-            includeOnlyClasses => ['WebGUI::Asset::Post::Thread'],
-            includeArchived    => 1,
-        },
-    );
-    foreach my $thread ( @{ $threads} ) {
-        ##Fix all double accounting on the thread
-        $thread->recalculatePostRating;
-
-        ##Recalculate the thread rating and also update the CS!
-        $thread->updateThreadRating;
-    }
-}
-
-##-------------------------------------------------
-sub addSkipNotificationColumn {
-    my $session = shift;
-    print "\tAdding Skip Notification column to Assets\n" unless ($quiet);
-    $session->db->write("alter table assetData add column skipNotification integer not null default 0");
-}
-
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/docs/upgrades/upgrade_7.3.9-7.3.10.pl b/docs/upgrades/upgrade_7.3.9-7.3.10.pl
deleted file mode 100644
index 6b12eba23..000000000
--- a/docs/upgrades/upgrade_7.3.9-7.3.10.pl
+++ /dev/null
@@ -1,150 +0,0 @@
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2006 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use lib "../../lib";
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-
-
-my $toVersion = "7.3.10"; # make this match what version you're going to
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-fixEventGroups($session);
-
-finish($session); # this line required
-
-
-##-------------------------------------------------
-#sub exampleFunction {
-#	my $session = shift;
-#	print "\tWe're doing some stuff here that you should know about.\n" unless ($quiet);
-#	# and here's our code
-#}
-
-#----------------------------------------------------------------------------
-sub fixEventGroups {
-    my $session     = shift;
-    print "\tFixing Event groups for Events created since 7.3.0.....";
-
-	my $events = WebGUI::Asset->getRoot($session)->getLineage(['descendants'], {
-        statesToInclude     => ['published','trash','clipboard','clipboard-limbo','trash-limbo'],
-        statusToInclude     => ['pending','approved','deleted','archived'],
-        includeOnlyClasses  => ['WebGUI::Asset::Event'],
-        returnObjects       => 1,
-        whereClause         => q{groupIdView = "" || groupIdEdit = "" || groupIdView IS NULL || groupIdEdit IS NULL},
-    });
-
-    for my $event (@$events) {
-        my $revisionProperties  = $event->get;
-
-        $revisionProperties->{groupIdView} ||= $event->getParent->get("groupIdView");
-        $revisionProperties->{groupIdEdit} ||= $event->getParent->get("groupIdEventEdit")
-                                           || $event->getParent->get("groupIdEdit");
-
-        $event->addRevision($revisionProperties, undef, {skipAutoCommitWorkflows=>1});
-    }
-
-    print "\tOK\n";
-}
-
-# ---- DO NOT EDIT BELOW THIS LINE ----
-
-#-------------------------------------------------
-sub start {
-	my $configFile;
-	$|=1; #disable output buffering
-	GetOptions(
-    		'configFile=s'=>\$configFile,
-        	'quiet'=>\$quiet
-	);
-	my $session = WebGUI::Session->open("../..",$configFile);
-	$session->user({userId=>3});
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->set({name=>"Upgrade to ".$toVersion});
-	$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-	updateTemplates($session);
-	return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-	my $session = shift;
-	my $versionTag = WebGUI::VersionTag->getWorking($session);
-	$versionTag->commit;
-	$session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-	my $session = shift;
-	return undef unless (-d "templates-".$toVersion);
-        print "\tUpdating templates.\n" unless ($quiet);
-	opendir(DIR,"templates-".$toVersion);
-	my @files = readdir(DIR);
-	closedir(DIR);
-	my $importNode = WebGUI::Asset->getImportNode($session);
-	my $newFolder = undef;
-	foreach my $file (@files) {
-		next unless ($file =~ /\.tmpl$/);
-		open(FILE,"<templates-".$toVersion."/".$file);
-		my $first = 1;
-		my $create = 0;
-		my $head = 0;
-		my %properties = (className=>"WebGUI::Asset::Template");
-		while (my $line = <FILE>) {
-			if ($first) {
-				$line =~ m/^\#(.*)$/;
-				$properties{id} = $1;
-				$first = 0;
-			} elsif ($line =~ m/^\#create$/) {
-				$create = 1;
-			} elsif ($line =~ m/^\#(.*):(.*)$/) {
-				$properties{$1} = $2;
-			} elsif ($line =~ m/^~~~$/) {
-				$head = 1;
-			} elsif ($head) {
-				$properties{headBlock} .= $line;
-			} else {
-				$properties{template} .= $line;	
-			}
-		}
-		close(FILE);
-		if ($create) {
-			$newFolder = createNewTemplatesFolder($importNode) unless (defined $newFolder);
-			my $template = $newFolder->addChild(\%properties, $properties{id});
-		} else {
-			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
-			if (defined $template) {
-				my $newRevision = $template->addRevision(\%properties);
-			}
-		}
-	}
-}
-
-#-------------------------------------------------
-sub createNewTemplatesFolder {
-	my $importNode = shift;
-	my $newFolder = $importNode->addChild({
-		className=>"WebGUI::Asset::Wobject::Folder",
-		title => $toVersion." New Templates",
-		menuTitle => $toVersion." New Templates",
-		url=> $toVersion."_new_templates",
-		groupIdView=>"12"
-		});
-	return $newFolder;
-}
-
-
-
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index ded20df0c..ed11042fa 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -2144,10 +2144,22 @@ sub www_editSave {
 	}
 
 	$object->updateHistory("edited");
+
 	if ($self->session->form->process("saveAndCommit") ne "") {
-		$self->session->http->setRedirect($self->getUrl("op=commitVersionTag;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId));
+        if ($self->session->setting->get("skipCommitComments")) {
+		    $self->session->http->setRedirect($self->getUrl("op=commitVersionTagConfirm;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId));
+        } else {
+		    $self->session->http->setRedirect($self->getUrl("op=commitVersionTag;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId));
+        }
 		return "1";
 	}
+	if ($self->session->setting->get("autoRequestCommit")) {
+        if ($self->session->setting->get("skipCommitComments")) {
+            WebGUI::VersionTag->getWorking($self->session)->requestCommit;
+        } else {
+		    $self->session->http->setRedirect($self->getUrl("op=commitVersionTag;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId));
+        }
+	}
 	if ($self->session->form->process("proceed") eq "manageAssets") {
 		$self->session->asset($object->getParent);
 		return $self->session->asset->www_manageAssets;
@@ -2166,6 +2178,7 @@ sub www_editSave {
 	return $self->session->asset->www_view;
 }
 
+                
 
 #-------------------------------------------------------------------
 
diff --git a/lib/WebGUI/Asset/FilePile.pm b/lib/WebGUI/Asset/FilePile.pm
index 5c9ab386c..9dd67cd0f 100644
--- a/lib/WebGUI/Asset/FilePile.pm
+++ b/lib/WebGUI/Asset/FilePile.pm
@@ -200,6 +200,24 @@ sub editSave {
 		
 	}
 	$tempStorage->delete;
+
+    # deal with special commit rules
+	if ($self->session->form->process("saveAndCommit") ne "") {
+        if ($self->session->setting->get("skipCommitComments")) {
+		    $self->session->http->setRedirect($self->getUrl("op=commitVersionTagConfirm;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId));
+        } else {
+		    $self->session->http->setRedirect($self->getUrl("op=commitVersionTag;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId));
+        }
+		return "1";
+	}
+	if ($self->session->setting->get("autoRequestCommit")) {
+        if ($self->session->setting->get("skipCommitComments")) {
+            WebGUI::VersionTag->getWorking($self->session)->requestCommit;
+        } else {
+		    $self->session->http->setRedirect($self->getUrl("op=commitVersionTag;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId));
+        }
+	}
+
 	return $self->getParent->www_manageAssets if ($self->session->form->process("proceed") eq "manageAssets");
 	return $self->getParent->www_view;
 }
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index 7b0b5538b..0e1a30223 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -268,6 +268,9 @@ sub www_setContentPositions {
 	$self->addRevision({
 		contentPositions=>$self->session->form->process("map")
 		});
+	if ($self->session->setting->get("autoRequestCommit")) {
+            WebGUI::VersionTag->getWorking($self->session)->requestCommit;
+    }
 	return "Map set: ".$self->session->form->process("map");
 }
 
diff --git a/lib/WebGUI/Form/Workflow.pm b/lib/WebGUI/Form/Workflow.pm
index a805ed625..744b18ef4 100644
--- a/lib/WebGUI/Form/Workflow.pm
+++ b/lib/WebGUI/Form/Workflow.pm
@@ -63,6 +63,11 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 If set to 1 then a "None" option will appear in the list of workflows, which will store a null value in the field. Defaults to 0.
 
+=head4 includeRealtime
+
+Most workflow triggers can't handle realtime workflows, so we leave out realtime workflows unless they should
+specifically be included.
+
 =cut
 
 sub definition {
@@ -86,6 +91,9 @@ sub definition {
 		none=>{
 			defaulValue=>0
 			},
+        includeRealtime => {
+            defaultValue => 0
+            },
         dbDataType  => {
             defaultValue    => "VARCHAR(22) BINARY",
         },
@@ -103,7 +111,7 @@ Renders a template picker control.
 
 sub toHtml {
 	my $self = shift;
-	my $workflowList = WebGUI::Workflow->getList($self->session, $self->get("type"));
+	my $workflowList = WebGUI::Workflow->getList($self->session, $self->get("type"), $self->get("includeRealtime"));
 	$workflowList->{""} = "None" if ($self->get("none"));
 	$self->set("options", $workflowList);
 	return $self->SUPER::toHtml();
diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm
index 8179c10f9..2b7e4326b 100644
--- a/lib/WebGUI/Macro/AdminBar.pm
+++ b/lib/WebGUI/Macro/AdminBar.pm
@@ -99,6 +99,13 @@ sub process {
 	my @tags = ();
 	if ($working) {
 		$workingId = $working->getId;
+        my $commitUrl = "";
+        if ($session->setting->get("skipCommitComments")) {
+            $session->url->page("op=commitVersionTagConfirm;tagId=".$workingId);
+        }
+        else {
+            $session->url->page("op=commitVersionTag;tagId=".$workingId);
+        }
 		push(@tags, {
 			url=>$session->url->page("op=commitVersionTag;tagId=".$workingId),
 			title=>$i18n->get("commit my changes"),
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index 79fbf5fbc..7095c76f1 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -77,7 +77,24 @@ sub definition {
 		defaultValue=>$session->setting->get("defaultVersionTagWorkflow"),
 		type=>"WebGUI::VersionTag",
 		label=>$i18n->get("default version tag workflow"),
-		hoverHelp=>$i18n->get('default version tag workflow help')
+		hoverHelp=>$i18n->get('default version tag workflow help'),
+        includeRealtime=>1,
+		});
+	push(@fields, {
+		tab=>"content",
+		fieldType=>"yesNo",
+        name=>"autoRequestCommit",
+        label=>$i18n->get("auto request commit"),
+        hoverHelp=>$i18n->get("auto request commit help"),
+        defaultValue=>$session->setting->get("autoRequestCommit")
+		});
+	push(@fields, {
+		tab=>"content",
+		fieldType=>"yesNo",
+        name=>"skipCommitComments",
+        label=>$i18n->get("skip commit comments"),
+        hoverHelp=>$i18n->get("skip commit comments"),
+        defaultValue=>$session->setting->get("skipCommitComments")
 		});
 	push(@fields, {
 		tab=>"content",
@@ -164,10 +181,10 @@ sub definition {
 	push(@fields, {
 		tab=>"content",
 		fieldType=>"yesNo",
-                name=>"metaDataEnabled",
-                label=>$i18n->get("Enable Metadata"),
-                hoverHelp=>$i18n->get("Enable Metadata description"),
-                defaultValue=>$session->setting->get("metaDataEnabled")
+        name=>"metaDataEnabled",
+        label=>$i18n->get("Enable Metadata"),
+        hoverHelp=>$i18n->get("Enable Metadata description"),
+        defaultValue=>$session->setting->get("metaDataEnabled")
 		});
 	# user interface settings
 	push(@fields, {
diff --git a/lib/WebGUI/Operation/VersionTag.pm b/lib/WebGUI/Operation/VersionTag.pm
index e7a31086a..d2079f044 100644
--- a/lib/WebGUI/Operation/VersionTag.pm
+++ b/lib/WebGUI/Operation/VersionTag.pm
@@ -116,7 +116,8 @@ sub www_editVersionTag {
 	if ($session->user->isInGroup("pbgroup000000000000016")) {
 		$f->workflow(
 			value=>$workflowId,
-			type=>"WebGUI::VersionTag"
+			type=>"WebGUI::VersionTag",
+            includeRealtime=>1,
 			);
 		$f->group(
 			value=>[$groupId],
@@ -240,13 +241,17 @@ sub www_commitVersionTagConfirm {
 	if ($tagId) {
 		my $tag = WebGUI::VersionTag->new($session, $tagId);
 		if (defined $tag && $session->user->isInGroup($tag->get("groupToUse"))) {
-			$tag->set({comments=>$session->form->process("comments", "textarea")});
-			$tag->requestCommit;
 			my $i18n = WebGUI::International->new($session, "VersionTag");
-        		my $ac = WebGUI::AdminConsole->new($session,"versions");
+			$tag->set({comments=>$session->form->process("comments", "textarea")});
+            eval { $tag->requestCommit; };
+            my $error = "";
+            if ($@) {
+                 $error .= $i18n->get("bad commit")." ".$@; 
+            }
+        	my $ac = WebGUI::AdminConsole->new($session,"versions");
 			my $default = WebGUI::Asset->getDefault($session);
 			return $ac->render(
-				'<p>'.$i18n->get("commit accepted").'</p>'
+				$error.'<p>'.$i18n->get("commit accepted").'</p>'
 				.'<ul>
 				<li><a href="'.$default->getUrl.'">'.$i18n->get("back to home").'</a></li>
 				<li><a href="'.$default->getUrl("op=manageVersions").'">'.$i18n->get("manage versions").'</a></li>
diff --git a/lib/WebGUI/Operation/Workflow.pm b/lib/WebGUI/Operation/Workflow.pm
index 52a934575..df46776ae 100644
--- a/lib/WebGUI/Operation/Workflow.pm
+++ b/lib/WebGUI/Operation/Workflow.pm
@@ -199,22 +199,21 @@ sub www_editWorkflow {
 		label=>$i18n->get("is enabled"),
 		hoverHelp=>$i18n->get("is enabled help")
 		);
-	$f->yesNo(
-		name=>"isSingleton",
-		value=>$workflow->get("isSingleton"),
-		defaultValue=>0,
-		label=>$i18n->get("is singleton"),
-		hoverHelp=>$i18n->get("is singleton help")
-		);
-	$f->yesNo(
-		name=>"isSerial",
-		value=>$workflow->get("isSerial"),
-		defaultValue=>0,
-		label=>$i18n->get("is serial"),
-		hoverHelp=>$i18n->get("is serial help")
+	$f->selectBox(
+		name=>"mode",
+        options=>{
+            singleton=>$i18n->get("singleton"),
+            parallel=>$i18n->get("parallel"),
+            serial=>$i18n->get("serial"),
+            realtime=>$i18n->get("realtime"),
+        },
+		value=>$workflow->get("mode") || "parallel",
+		defaultValue=>"parallel",
+		label=>$i18n->get("mode"),
+		hoverHelp=>$i18n->get("mode help")
 		);
 	$f->submit;
-	my $steps = '<div style="clear:both"></div><table class="content">';
+	my $steps = '<table class="content">';
 	my $rs = $session->db->read("select activityId, title from WorkflowActivity where workflowId=? order by sequenceNumber",[$workflow->getId]);
 	while (my ($id, $title) = $rs->array) {
 		$steps .= '<tr><td>'
@@ -224,7 +223,7 @@ sub www_editWorkflow {
 			.$session->icon->moveUp("op=promoteWorkflowActivity;workflowId=".$workflow->getId.";activityId=".$id)
 			.'</td><td>'.$title.'</td></tr>';	
 	}
-	$steps .= '</table>';
+	$steps .= '</table><div style="clear: both;"></div>';
 	my $ac = WebGUI::AdminConsole->new($session,"workflow");
 	$ac->addSubmenuItem($session->url->page("op=addWorkflow"), $i18n->get("add a new workflow"));
 	$ac->addSubmenuItem($session->url->page("op=manageWorkflows"), $i18n->get("manage workflows"));
@@ -247,8 +246,7 @@ sub www_editWorkflowSave {
 	my $workflow = WebGUI::Workflow->new($session, $session->form->param("workflowId"));
 	$workflow->set({
 		enabled     => $session->form->get("enabled",     "yesNo"),
-		isSingleton => $session->form->get("isSingleton", "yesNo"),
-		isSerial    => $session->form->get("isSerial",    "yesNo"),
+		mode        => $session->form->get("mode"),
 		title       => $session->form->get("title"),
 		description => $session->form->get("description", "textarea"),
 		});
diff --git a/lib/WebGUI/VersionTag.pm b/lib/WebGUI/VersionTag.pm
index 7359ba077..e11e44361 100644
--- a/lib/WebGUI/VersionTag.pm
+++ b/lib/WebGUI/VersionTag.pm
@@ -15,6 +15,7 @@ package WebGUI::VersionTag;
 =cut
 
 use strict;
+use Carp qw(carp);
 use WebGUI::Asset;
 use WebGUI::Workflow::Instance;
 
@@ -383,7 +384,8 @@ sub new {
 
 =head2 requestCommit ( )
 
-Locks the version tag and then kicks off the approval/commit workflow for it.
+Locks the version tag and then kicks off the approval/commit workflow for it. A carp is thrown if workflow is
+realtime and fails.
 
 =cut
 
@@ -399,6 +401,19 @@ sub requestCommit {
 	$self->{_data}{committedBy} = $self->session->user->userId;
 	$self->{_data}{workflowInstanceId} = $instance->getId;
 	$self->session->db->setRow("assetVersionTag","tagId",$self->{_data});
+
+    # deal with realtime
+    if ($instance->getWorkflow->isRealtime) {
+        my $status = $instance->runAll;
+        if ($status eq "done") {
+            $instance->delete;
+        } else {
+            my $errorMessage = "Realtime workflow instance ".$instance->getId." returned status ".$status." where
+                'done' was expected";
+            $self->session->errorHandler->warn($errorMessage);
+            carp $errorMessage;
+        }
+    }
 }
 
 
diff --git a/lib/WebGUI/Workflow.pm b/lib/WebGUI/Workflow.pm
index 7ea856a1f..b70a47134 100644
--- a/lib/WebGUI/Workflow.pm
+++ b/lib/WebGUI/Workflow.pm
@@ -227,6 +227,8 @@ sub getActivities {
 	return \@activities;
 }
 
+#-------------------------------------------------------------------
+
 =head2 getInstances ( )
 
 Returns an array reference of the instance objects currently existing for this workflow.
@@ -243,6 +245,8 @@ sub getInstances {
 	return \@instances;
 }
 
+#-------------------------------------------------------------------
+
 =head2 getCrons ( )
 
 Returns an array reference of the cron objects that trigger this workflow.
@@ -274,7 +278,7 @@ sub getId {
 
 #-------------------------------------------------------------------
 
-=head2 getList ( session, [ type ] )
+=head2 getList ( session, [ type, includeRealtime ] )
 
 Returns a hash reference of workflowId/title pairs of all enabled workflows.  This is a class method.
 
@@ -286,18 +290,27 @@ A reference to the current session.
 
 If specified this will limit the list to a certain type of workflow based upon the object type that the workflow is set up to handle.
 
+=head3 includeRealtime
+
+If set to 1 the list returned will include workflows with a mode of "realtime", otherwise it won't.
+
 =cut
 
 sub getList {
 	my $class = shift;
 	my $session = shift;
 	my $type = shift;
+    my $includeRealtime = shift;
 	my $sql = "select workflowId, title from Workflow where enabled=1";
+    my @params;
 	if ($type) {
 		$sql .= " and type=?";
-		$type = [$type];
+		push(@params, $type);
 	}
-	return $session->db->buildHashRef($sql, $type);
+    unless ($includeRealtime) {
+        $sql .= " and mode<>'realtime'";
+    }
+	return $session->db->buildHashRef($sql, \@params);
 }
 
 
@@ -324,6 +337,62 @@ sub getNextActivity {
 }
 
 
+#-------------------------------------------------------------------
+
+=head2 isParallel ( ) 
+
+Returns 1 if the mode is set to "parallel".
+
+=cut
+
+sub isParallel {
+    my $self = shift;
+    return ($self->get("mode") eq "parallel") ? 1 : 0;
+}
+
+
+#-------------------------------------------------------------------
+
+=head2 isRealtime ( ) 
+
+Returns 1 if the mode is set to "realtime".
+
+=cut
+
+sub isRealtime {
+    my $self = shift;
+    return ($self->get("mode") eq "realtime") ? 1 : 0;
+}
+
+
+#-------------------------------------------------------------------
+
+=head2 isSerial ( ) 
+
+Returns 1 if the mode is set to "serial".
+
+=cut
+
+sub isSerial {
+    my $self = shift;
+    return ($self->get("mode") eq "serial") ? 1 : 0;
+}
+
+
+#-------------------------------------------------------------------
+
+=head2 isSingleton ( ) 
+
+Returns 1 if the mode is set to "singleton".
+
+=cut
+
+sub isSingleton {
+    my $self = shift;
+    return ($self->get("mode") eq "singleton") ? 1 : 0;
+}
+
+
 #-------------------------------------------------------------------
 
 =head2 new ( session, workflowId )
@@ -431,34 +500,30 @@ A boolean indicating whether this workflow may be executed right now.
 
 A string indicating the type of object this workflow will be operating on. Valid values are "None", or any object type, like "WebGUI::VersionTag".
 
-=head4 isSingleton
+=head4 mode
 
-A boolean indicating whether this workflow should be run as a singleton. If it's a singleton, then only one instance of the workflow will be allowed to be created at a given time. So if you try to create a new instance of it, and one instance is already created, the create() method will return undef instead of a reference to the object.
-
-=head4 isSerial
-
-A boolean indicating whether this workflow should be run in serial mode. If it's run in serial, then only one instance of this workflow will be run at a given time, and all other instances of it will queue up.
+A string containing one of "singleton", "parallel", "serial", or "realtime". Parallel is the default and should be
+used in most situations. Singltons will allow only one instance of the workflow to be created at one time. New
+instances will be destroyed immediately if a one instance of a singleton already exists. Serial workflows will run
+instances sequentially in FIFO. Realtime workflows will run immediately without being handed off to Spectre for
+governance.
 
 =cut
 
 sub set {
 	my $self = shift;
 	my $properties = shift;
-	if ($properties->{enabled} == 1) {
-		$self->{_data}{enabled} = 1;
-	} elsif ($properties->{enabled} == 0) {
-		$self->{_data}{enabled} = 0;
-	}
+
+    # depricated. replaced by mode.
 	if ($properties->{isSerial} == 1) {
-		$self->{_data}{isSerial} = 1;
-	} elsif ($properties->{isSerial} == 0) {
-		$self->{_data}{isSerial} = 0;
+		$properties->{mode} = "serial";
 	}
 	if ($properties->{isSingleton} == 1) {
-		$self->{_data}{isSingleton} = 1;
-	} elsif ($properties->{isSingleton} == 0) {
-		$self->{_data}{isSingleton} = 0;
+		$properties->{mode} = "singleton";
 	}
+
+    $self->{_data}{mode} = $properties->{mode} || "parallel";
+	$self->{_data}{enabled} = ($properties->{enabled} == 1) ? 1 : 0;
 	$self->{_data}{title} = $properties->{title} || $self->{_data}{title} || "Untitled";
 	$self->{_data}{description} = (exists $properties->{description}) ? $properties->{description} : $self->{_data}{description};
 	$self->{_data}{type} = $properties->{type} || $self->{_data}{type} || "None";
diff --git a/lib/WebGUI/Workflow/Instance.pm b/lib/WebGUI/Workflow/Instance.pm
index f1d008083..eed7f9454 100644
--- a/lib/WebGUI/Workflow/Instance.pm
+++ b/lib/WebGUI/Workflow/Instance.pm
@@ -42,7 +42,8 @@ These methods are available from this class:
 
 =head2 create ( session, properties ) 
 
-Creates a new workflow instance and returns a reference to the object. Will return undef if the workflow specified is serial and an instance of it already exists.
+Creates a new workflow instance and returns a reference to the object. Will return undef if the workflow specified
+is singleton and an instance of it already exists.
 
 =head3 session
 
@@ -58,10 +59,17 @@ sub create {
 	my $class = shift;
 	my $session = shift;
 	my $properties = shift;
-	my ($isSingleton) = $session->db->quickArray("select isSingleton from Workflow where workflowId=?",[$properties->{workflowId}]);
-	my $params = (exists $properties->{parameters}) ? JSON::objToJson({parameters => $properties->{parameters}}, {pretty => 1, indent => 4, autoconv=>0, skipinvalid=>1}) : undef;
+
+    # do singleton check
+	my ($isSingleton) = $session->db->quickArray("select count(*) from Workflow where workflowId=? and
+    mode='singleton'",[$properties->{workflowId}]);
+	my $params = (exists $properties->{parameters}) 
+        ? JSON::objToJson({parameters => $properties->{parameters}}, {pretty => 1, indent => 4, autoconv=>0, skipinvalid=>1}) 
+        : undef;
 	my ($count) = $session->db->quickArray("select count(*) from WorkflowInstance where workflowId=? and parameters=?",[$properties->{workflowId},$params]);
 	return undef if ($isSingleton && $count);
+
+    # create instance
 	my $instanceId = $session->db->setRow("WorkflowInstance","instanceId",{instanceId=>"new", runningSince=>time()});
 	my $self = $class->new($session, $instanceId);
 	$properties->{notifySpectre} = 1 unless ($properties->{notifySpectre} eq "0");
@@ -119,8 +127,9 @@ Deconstructor.
 =cut
 
 sub DESTROY {
-        my $self = shift;
-        undef $self;
+    my $self = shift;
+    delete $self->{_workflow};
+    undef $self;
 }
 
 
@@ -153,12 +162,12 @@ Returns an array reference of all the instance objects defined in this system. A
 sub getAllInstances {
 	my $class = shift;
 	my $session = shift;
-        my @instances = ();
-        my $rs = $session->db->read("SELECT instanceId FROM WorkflowInstance");
-        while (my ($instanceId) = $rs->array) {
-                push(@instances, WebGUI::Workflow::Instance->new($session, $instanceId));
-        }
-        return \@instances;	
+    my @instances = ();
+    my $rs = $session->db->read("SELECT instanceId FROM WorkflowInstance");
+    while (my ($instanceId) = $rs->array) {
+        push(@instances, WebGUI::Workflow::Instance->new($session, $instanceId));
+    }
+    return \@instances;	
 }
 
 
@@ -218,7 +227,10 @@ Returns a reference to the workflow object this instance is associated with.
 
 sub getWorkflow {
 	my $self = shift;
-	return WebGUI::Workflow->new($self->session, $self->get("workflowId"));
+    unless (exists $self->{_workflow}) {
+        $self->{_workflow} = WebGUI::Workflow->new($self->session, $self->get("workflowId"));
+    }
+    return $self->{_workflow};
 }
 
 #-------------------------------------------------------------------
@@ -272,7 +284,7 @@ sub run {
 		$self->set({lastStatus=>"disabled", notifySpectre=>0});
 		return "disabled";
 	}
-	if ($workflow->get("isSerial")) {
+	if ($workflow->isSerial) {
 		my ($firstId) = $self->session->db->quickArray(
             "select instanceId from WorkflowInstance where workflowId=? order by runningSince",
             [$workflow->getId]
@@ -333,6 +345,23 @@ sub run {
 	return $status;
 }
 
+#-------------------------------------------------------------------
+
+=head2 runAll ( )
+
+Runs all activities in this workflow instance, and returns the last status code, which should be "done" unless
+something bad happens.
+
+=cut
+
+sub runAll {
+    my $self = shift;
+    my $status = "complete";
+    while ($status eq "complete") {
+        $status = $self->run;
+    }
+    return $status;
+}
 
 #-------------------------------------------------------------------
 
@@ -401,7 +430,7 @@ sub set {
 	$self->{_data}{currentActivityId} = (exists $properties->{currentActivityId}) ? $properties->{currentActivityId} : $self->{_data}{currentActivityId};
 	$self->{_data}{lastUpdate} = time();
 	$self->session->db->setRow("WorkflowInstance","instanceId",$self->{_data});
-	if ($properties->{notifySpectre}) {
+	if (!$self->getWorkflow->isRealtime && $properties->{notifySpectre}) {
 		my $spectre = WebGUI::Workflow::Spectre->new($self->session);
 		$spectre->notify("workflow/deleteInstance",$self->getId) unless ($properties->{newlyCreated});
 		$spectre->notify("workflow/addInstance", {cookieName=>$self->session->config->getCookieName, gateway=>$self->session->config->get("gateway"), sitename=>$self->session->config->get("sitename")->[0], instanceId=>$self->getId, priority=>$self->{_data}{priority}});
diff --git a/lib/WebGUI/i18n/English/VersionTag.pm b/lib/WebGUI/i18n/English/VersionTag.pm
index c7c4a5c97..f8de029e5 100644
--- a/lib/WebGUI/i18n/English/VersionTag.pm
+++ b/lib/WebGUI/i18n/English/VersionTag.pm
@@ -7,6 +7,12 @@ our $I18N = {
 		lastUpdated => 0 
 	},
 
+	'bad commit' => {
+		message => q|Something bad happened while trying to commit your content. Please contact your system
+        administrator.|,
+		lastUpdated => 0 
+	},
+
 	'back to home' => {
 		message => q|Back to home.|,
 		lastUpdated => 0 
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index dce46c7b0..a15444f7c 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -1,6 +1,28 @@
 package WebGUI::i18n::English::WebGUI;
 
 our $I18N = {
+	'skip commit comments' => {
+		message => q|Skip commit comments?|,
+		lastUpdated => 0,
+	},
+
+	'skip commit comments help' => {
+		message => q|Do you wish to be prompted to add comments to your content commits?|,
+		lastUpdated => 0,
+	},
+
+	'auto request commit' => {
+		message => q|Automatically request commit?|,
+		lastUpdated => 0,
+	},
+
+	'auto request commit help' => {
+		message => q|Would you like the system to automatically request commits for you so that you don't have to
+        remember to hit "Commit My Changes"? Note that when using this in conjunction with "Skip commit comments?"
+        and a realtime commit workflow it effectively hides the whole versioning and workflow process from users.|,
+		lastUpdated => 0,
+	},
+
 	'select' => {
 		message => q|Select|,
 		lastUpdated => 0,
diff --git a/lib/WebGUI/i18n/English/Workflow.pm b/lib/WebGUI/i18n/English/Workflow.pm
index 290255c85..a12a5d0de 100644
--- a/lib/WebGUI/i18n/English/Workflow.pm
+++ b/lib/WebGUI/i18n/English/Workflow.pm
@@ -49,27 +49,47 @@ our $I18N = {
 		lastUpdated => 0,
 	},
 
-	'is singleton help' => {
-		message => q|If yes is selected then only one instance of this workflow will be allowed to be created at one time. Generally speaking this would be a bad idea for approval workflows, but is probably a good idea for workflows that download emails from a remote server, to avoid getting duplicates.|,
-		context => q|the hover help for the is singleton field|,
-		lastUpdated => 0,
-	},
+    'singleton' => {
+        message => q|Singleton|,
+    },
 
-	'is singleton' => {
-		message => q|Is a singleton?|,
-		context => q|A question that asks the user whether this workflow may be instanciated multiple times concurrently or not.|,
-		lastUpdated => 0,
-	},
+    'serial' => {
+        message => q|Serial|,
+    },
 
-	'is serial help' => {
-		message => q|If yes is selected then only one instance of this workflow will be allowed to be run at one time, while new instances get queued up and wait for the running one to complete. This is generally bad for a workflow, but it can be good when multiple instances of workflow have to operate on the same data.|,
-		context => q|the hover help for the is serial field|,
-		lastUpdated => 0,
-	},
+    'parallel' => {
+        message => q|Parallel|,
+    },
 
-	'is serial' => {
-		message => q|Is serial?|,
-		context => q|A question that asks the user whether this workflow may be instanciated multiple times concurrently or not.|,
+    'realtime' => {
+        message => q|Realtime|,
+    },
+
+    'mode' => {
+        message => q|Mode|,
+    },
+
+	'mode help' => {
+		message => q|The mode of a workflow determines the precidence of when and how a workflow is run.
+        <p>Parallel workflows may run as many instances of the workflow as there are in existence. This is what you 
+        want for most workflows. This mode is asynchronous.</p>
+        <p>Singleton means only one instance of this workflow will be allowed to be created at one time. Generally 
+        speaking this would be a bad idea for approval workflows, but is probably a good idea for workflows that 
+        download emails from a remote server, to avoid getting duplicates. This mode is asynchronous.</p>
+        <p>Serial means that you can create as many instances of a workflow that you like, but they will run 
+        sequentially one after the other. Two instances of the same workflow will not run a the same time. This 
+        is generally bad for approval processes, but it's good for maintenance functions or other things that need 
+        to operate on the same data. Processing sequentially will ensure that the workflows don't overwrite each 
+        other's data. This mode is asynchronous.</p>
+        <p>Realtime workflows run immediately and in parallel, meaning there can be more than one workflow of this
+        type in existence at one time and it will run at the same time as others. Realtime workflows are good for 
+        publishing operations that don't have an approval needed and other functions that you want to ensure happen 
+        immediately. This mode is synchronous. <b>NOTE:</b> Do not include any activities which may return a
+        waiting status, such as those that require human approval or an external event to occur. Doing so will
+        cause this workflow to run indefinitely and could lead to a crashed system. In addition, not all triggers
+        support realtime workflows. If they do not, then workflows with a mode of realtime won't show up in their
+        workflow select list.|,
+		context => q|the hover help for the mode field|,
 		lastUpdated => 0,
 	},
 
diff --git a/sbin/upgrade.pl b/sbin/upgrade.pl
index f3ef264b2..504560ec1 100644
--- a/sbin/upgrade.pl
+++ b/sbin/upgrade.pl
@@ -338,14 +338,14 @@ STOP
 #-----------------------------------------
 # checkVersion($versionNumber)
 #-----------------------------------------
-# Version number must be 6.9.0 or greater
+# Version number must be 7.3.18 or greater
 # in order to be upgraded by this utility.
 #-----------------------------------------
 sub checkVersion {
 	$_[0] =~ /(\d+)\.(\d+)\.(\d+)/; 
-	my $goal = 6;
-	my $feature = 8;
-	my $fix = 10;
+	my $goal = 7;
+	my $feature = 3;
+	my $fix = 18;
         if ($1 > $goal) {
         	return 1;
         } elsif ($1 == $goal) {