diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index c91cd76f3..356e3e83f 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,115 +1,116 @@
-7.0.3
- - Fixed a problem with the 7.0.0-7.0.1 upgrade relating to internationalized
-   department names.
- - fix: Missing documentation breaks the List of Available Macros (Wouter
-   van Oijen / ProcoliX)
- - fix: Article thumbnail not working (Len Kranendonk)
- - Fixed a bug in WebGUI::Asset::Post where userDefined and synopsis form
-   elements were not populated when previewed. (Martin Kamerbeek / Procolix)
- - fix: Indent Navigation broken (Wouter van Oijen / ProcoliX)
- - fix: HttpProxy not working (with fix) (Eric Kennedy)
- - fix: Copyright on Default Template (Wouter van Oijen / ProcoliX)
- - fix: FileUrl macro doesn't handle snippets (Wouter van Oijen / ProcoliX)
- - fix: Dataform adding fields without fieldname (Wouter van Oijen / ProcoliX)
- - fix: Fatal in Affiliate.pm
- - Fixed several problems to make WebGUI 7 Windows compatible again.
- - fix: navigation (Wouter van Oijen / Procolix)
- - Fixed typo in template variable project.gantt.rowspan and documentation
-
-
-7.0.2
- - fix: upgrade from 6.99.4-6.99-5 can fail if site contains groups tied to ldap with no users in it.
- - GroupText macro returns an error message if it can't find the group by the name the user supplies.
- - fix: Unable to remove databaselinks (Thanks to misja)
- - fix: Collaboration System hangs under certain conditions (Martin Kamerbeek
-   / Procolix)
- - fix: Insert WebGUI Image inserts image, but does not retain border, spacing
-   or alignment.(Martin Kamerbeek / Procolix)
- - Added Chinese character support to search engine and indexer thanks to Zhou
-   Xiaopeng.
- - fix: issue with recursive ldap filter causing it not to work properly
- - fix: upgrade 7.0.0 to 7.0.1 ldap problem
- - fix: Typo when trying to display pvt profile
- - Added an unsubscribe link to the messages generated by collaboration
-   subscriptions per the laws in various countries.
- - fix: MultiSearch
- - fix: Unable to duplicate existing Session Id
- - fix: Admins not in visitors group
- - fix: Data Form Text Area ignores size settings
- - Fixed a bug that didn't allow you to search a matrix.
- - Fixed a bug in the upgrade that caused template problems with the WebGUI 6
-   template if anyone was still using that.
- - Fixed a bug where the template variables currentPage.hasViewableSiblings
-   and currentPage.hasViewableChildren were always false. Added the
-   page.parent.rank template variable to the Navigation template. (Martin
-   Kamerbeek /  Procolix)
- - Fixed a bug where WebGUI::Asset::File->addRevision did not set correct
-   privs to the storage associated with it. (Martin Kamerbeek / Procolix)
- - Added a reverse page loop option to the navigation asset (Martin 
-   Kamerbeek / Procolix)
- - fix: cs mail needs archive url
- - fix: cs mail not sending in-reply-to and references headers
- - fix: cs mail doesn't like code via email
- - CS mail now sends out the email address of the poster as from, when it
-   exists.
- - fix: WebGUI::Image missing methods
- - Added runOnLogin and runOnLogout config file properties to Authentication to allow
-   for running an external script on successful login or logout.
- - fix: spectre
- - fix: Spectre tries to delete the same workflow instance twice
- - Fixed part of the Spectre memory leak. See gotcha.txt for details.
-
-   
-7.0.1
- - fix: User profile field "Department" needs i18n 
- - fix: AssetProxied Navigation context menu - items invisible in Style 02
- - fix: Request Tracker Asset - Reply to a post displays Severity drop down
-   list
- - fix: Syndicated wobject erro 6.8+
- - fix: new spectre.pl error (Martin Kamerbeek / Procolix)
- - fix: Can't create new account
- - fix: Several new assets aren't added to config during upgrade process
- - fix: Post Subject HTML
- - fix: Matrix: can't instantiate template
- - fix: Session id (Martin Kamerbeek / Procolix)
- - fix: Style Wizard
- - fix: content-type
- - fix: Two cookies and incorrect Last-Modified date in HTTP header
- - fix: HTTP status code 404 broken
- - fix: Add missing page on Problem With Request
- - fix: Avatar/photo upload not working
- - fix: Shortcut with content lock fails (Thanks to Michelle Lamar)
- - fix: Security bug in session env
- - fix: Ldap Registration of new users (Thanks to guiuser)
- - fix: Missing/Incorrect POD
- - Made changes to spectre to handle finished workflows better.
- - Added filter to groups and ldap connections to filter out group members in cases where the ldap group propery and the recursive group poperty are the same
-
-
-7.0.0
- - Welcome to a whole new world of WebGUI. After 2.5 years and 20,000 hours of
-   development, WebGUI 7 is finally here.
- - Fixed a bug in the asset manager where you could be redirected to a wrong
-   page after using the delete, copy, cut, duplicate buttons.
- - fix: Can't set View Purchase History Template in commerce settings
- - fix: Template toolbar missing for Transaction Error Template
- - fix: Page fails and cannot be edited except through the db if custom rich editor deleted.
- - fix: Search returns not restricted to chosen path or asset type
- - fix: Product Asset - specification labels not showing
- - fix: Folders displayed for underprivileged users (wouter / Procolix)
- - fix: Secure the search function
- - fix: Export Functionality
- - fix: Search displays already deleted files
- - fix: Pagination not working in User Management System
- - fix: Upgrade 6.8.10 to 6.99.5 (Thanks to Erik Svanberg for the patch)
- - fix: Adding Survey Choices
- - fix: User/Group problem
- - fix: Edit LDAP Connection
- - fix: SQL Report w/ pagination and nested queries
- - fix: Unable to add Web Services Client
- - Fixed a bug in spectre where it wasn't using session cookies.
- - Fixed a bug in spectre where you couldn't shut it down if you started it on
-   an IP other than 127.0.0.1.
- - Made the Include macro more secure.
- - Added Len's patch to fix some caching problems.
-
+7.0.3
+ - Fixed a problem with the 7.0.0-7.0.1 upgrade relating to internationalized
+   department names.
+ - fix: Missing documentation breaks the List of Available Macros (Wouter
+   van Oijen / ProcoliX)
+ - fix: Article thumbnail not working (Len Kranendonk)
+ - Fixed a bug in WebGUI::Asset::Post where userDefined and synopsis form
+   elements were not populated when previewed. (Martin Kamerbeek / Procolix)
+ - fix: Indent Navigation broken (Wouter van Oijen / ProcoliX)
+ - fix: HttpProxy not working (with fix) (Eric Kennedy)
+ - fix: Copyright on Default Template (Wouter van Oijen / ProcoliX)
+ - fix: FileUrl macro doesn't handle snippets (Wouter van Oijen / ProcoliX)
+ - fix: Dataform adding fields without fieldname (Wouter van Oijen / ProcoliX)
+ - fix: Fatal in Affiliate.pm
+ - Fixed several problems to make WebGUI 7 Windows compatible again.
+ - fix: navigation (Wouter van Oijen / ProcoliX)
+ - Fixed typo in template variable project.gantt.rowspan and documentation
+ - fix: Events Calendar Double Date (Wouter van Oijen / ProcoliX)
+
+
+7.0.2
+ - fix: upgrade from 6.99.4-6.99-5 can fail if site contains groups tied to ldap with no users in it.
+ - GroupText macro returns an error message if it can't find the group by the name the user supplies.
+ - fix: Unable to remove databaselinks (Thanks to misja)
+ - fix: Collaboration System hangs under certain conditions (Martin Kamerbeek
+   / Procolix)
+ - fix: Insert WebGUI Image inserts image, but does not retain border, spacing
+   or alignment.(Martin Kamerbeek / Procolix)
+ - Added Chinese character support to search engine and indexer thanks to Zhou
+   Xiaopeng.
+ - fix: issue with recursive ldap filter causing it not to work properly
+ - fix: upgrade 7.0.0 to 7.0.1 ldap problem
+ - fix: Typo when trying to display pvt profile
+ - Added an unsubscribe link to the messages generated by collaboration
+   subscriptions per the laws in various countries.
+ - fix: MultiSearch
+ - fix: Unable to duplicate existing Session Id
+ - fix: Admins not in visitors group
+ - fix: Data Form Text Area ignores size settings
+ - Fixed a bug that didn't allow you to search a matrix.
+ - Fixed a bug in the upgrade that caused template problems with the WebGUI 6
+   template if anyone was still using that.
+ - Fixed a bug where the template variables currentPage.hasViewableSiblings
+   and currentPage.hasViewableChildren were always false. Added the
+   page.parent.rank template variable to the Navigation template. (Martin
+   Kamerbeek /  Procolix)
+ - Fixed a bug where WebGUI::Asset::File->addRevision did not set correct
+   privs to the storage associated with it. (Martin Kamerbeek / Procolix)
+ - Added a reverse page loop option to the navigation asset (Martin 
+   Kamerbeek / Procolix)
+ - fix: cs mail needs archive url
+ - fix: cs mail not sending in-reply-to and references headers
+ - fix: cs mail doesn't like code via email
+ - CS mail now sends out the email address of the poster as from, when it
+   exists.
+ - fix: WebGUI::Image missing methods
+ - Added runOnLogin and runOnLogout config file properties to Authentication to allow
+   for running an external script on successful login or logout.
+ - fix: spectre
+ - fix: Spectre tries to delete the same workflow instance twice
+ - Fixed part of the Spectre memory leak. See gotcha.txt for details.
+
+   
+7.0.1
+ - fix: User profile field "Department" needs i18n 
+ - fix: AssetProxied Navigation context menu - items invisible in Style 02
+ - fix: Request Tracker Asset - Reply to a post displays Severity drop down
+   list
+ - fix: Syndicated wobject erro 6.8+
+ - fix: new spectre.pl error (Martin Kamerbeek / Procolix)
+ - fix: Can't create new account
+ - fix: Several new assets aren't added to config during upgrade process
+ - fix: Post Subject HTML
+ - fix: Matrix: can't instantiate template
+ - fix: Session id (Martin Kamerbeek / Procolix)
+ - fix: Style Wizard
+ - fix: content-type
+ - fix: Two cookies and incorrect Last-Modified date in HTTP header
+ - fix: HTTP status code 404 broken
+ - fix: Add missing page on Problem With Request
+ - fix: Avatar/photo upload not working
+ - fix: Shortcut with content lock fails (Thanks to Michelle Lamar)
+ - fix: Security bug in session env
+ - fix: Ldap Registration of new users (Thanks to guiuser)
+ - fix: Missing/Incorrect POD
+ - Made changes to spectre to handle finished workflows better.
+ - Added filter to groups and ldap connections to filter out group members in cases where the ldap group propery and the recursive group poperty are the same
+
+
+7.0.0
+ - Welcome to a whole new world of WebGUI. After 2.5 years and 20,000 hours of
+   development, WebGUI 7 is finally here.
+ - Fixed a bug in the asset manager where you could be redirected to a wrong
+   page after using the delete, copy, cut, duplicate buttons.
+ - fix: Can't set View Purchase History Template in commerce settings
+ - fix: Template toolbar missing for Transaction Error Template
+ - fix: Page fails and cannot be edited except through the db if custom rich editor deleted.
+ - fix: Search returns not restricted to chosen path or asset type
+ - fix: Product Asset - specification labels not showing
+ - fix: Folders displayed for underprivileged users (wouter / Procolix)
+ - fix: Secure the search function
+ - fix: Export Functionality
+ - fix: Search displays already deleted files
+ - fix: Pagination not working in User Management System
+ - fix: Upgrade 6.8.10 to 6.99.5 (Thanks to Erik Svanberg for the patch)
+ - fix: Adding Survey Choices
+ - fix: User/Group problem
+ - fix: Edit LDAP Connection
+ - fix: SQL Report w/ pagination and nested queries
+ - fix: Unable to add Web Services Client
+ - Fixed a bug in spectre where it wasn't using session cookies.
+ - Fixed a bug in spectre where you couldn't shut it down if you started it on
+   an IP other than 127.0.0.1.
+ - Made the Include macro more secure.
+ - Added Len's patch to fix some caching problems.
+
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
new file mode 100644
index 000000000..b01cc5a04
--- /dev/null
+++ b/docs/upgrades/templates-7.0.3/events_calendar_event_list.tmpl
@@ -0,0 +1,76 @@
+#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>