Index: lams_tool_wiki/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -rb6718851271ad991d43a5a3158f8e10c9ccceaaa -rb28977a121d592ca6b0bf0e5446969ebff7bac1a
--- lams_tool_wiki/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision b6718851271ad991d43a5a3158f8e10c9ccceaaa)
+++ lams_tool_wiki/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision b28977a121d592ca6b0bf0e5446969ebff7bac1a)
@@ -34,6 +34,7 @@
 <%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="timeago" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
@@ -42,6 +43,10 @@
 	<c:set var="type" value="both" scope="request"/>
 </c:if>
 
+<c:if test="${not empty timeago}">
+	<time class="timeago" datetime="<fmt:formatDate value='${value}' timeZone="GMT" pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>">
+</c:if>
+	
 <c:choose>
 	<c:when test="${style=='short'}">
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="short" timeStyle="short" />
@@ -53,3 +58,7 @@
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="long" timeStyle="medium" />
 	</c:otherwise>
 </c:choose>
+
+<c:if test="${not empty timeago}">
+	</time>
+</c:if>
\ No newline at end of file
Index: lams_tool_wiki/web/pages/authoring/basic.jsp
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -rb28977a121d592ca6b0bf0e5446969ebff7bac1a
--- lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision b28977a121d592ca6b0bf0e5446969ebff7bac1a)
@@ -74,7 +74,7 @@
 				</c:choose>
 			</fmt:param>
             <fmt:param>
-               <time class="timeago" datetime="<fmt:formatDate value='${currentWikiPage.currentWikiContentDTO.editDate}' pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>"><lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" /></time>
+	            <lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" timeago="true"/>
              </fmt:param>
 		</fmt:message> 
 		</div> <!-- End last edited -->
Index: lams_tool_wiki/web/pages/authoring/headItems.jsp
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -rb28977a121d592ca6b0bf0e5446969ebff7bac1a
--- lams_tool_wiki/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision b28977a121d592ca6b0bf0e5446969ebff7bac1a)
@@ -11,4 +11,10 @@
 <script type="text/javascript" src="${tool}includes/javascript/wikiCommon.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript" src="${lams}/includes/javascript/jquery.timeago.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+
+<script type="text/javascript">
+	$(document).ready(function() {$("time.timeago").timeago();});
+</script>
+
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -rb28977a121d592ca6b0bf0e5446969ebff7bac1a
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision b28977a121d592ca6b0bf0e5446969ebff7bac1a)
@@ -3,12 +3,17 @@
     <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
     <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
     <script language="JavaScript" type="text/javascript" src="includes/javascript/validation.js"></script>
+    <script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/jquery.timeago.js"></script>
 
     <script type="text/javascript">
       <!--
         var mode = "${mode}";
       var formName = "learningForm"
 
+   	  $(document).ready(function() {
+  			$("time.timeago").timeago();
+ 		});
+      
       function disableFinishButton() {
         document.getElementById("finishButton").disabled = true;
       }
@@ -201,7 +206,7 @@
                               </c:choose>
                             </fmt:param>
                             <fmt:param>
-                              <time class="timeago" datetime="<fmt:formatDate value='${currentWikiPage.currentWikiContentDTO.editDate}' pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>"><lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" /></time>
+                              <lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" timeago="true"/>
                             </fmt:param>
                           </fmt:message> 
                         </div> <!-- End last edited -->
Index: lams_tool_wiki/web/pages/monitoring/headItems.jsp
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -rb28977a121d592ca6b0bf0e5446969ebff7bac1a
--- lams_tool_wiki/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision b28977a121d592ca6b0bf0e5446969ebff7bac1a)
@@ -4,7 +4,13 @@
 	<lams:WebAppURL />
 </c:set>
 
+<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.timeago.js"></script>
+
 <script type="text/javascript" src="${tool}includes/javascript/monitoring.js">
 </script>
 
 <script type="text/javascript" src="<lams:WebAppURL />/includes/javascript/wikiCommon.js"></script>
+
+<script type="text/javascript">
+	$(document).ready(function() {$("time.timeago").timeago();});
+</script>
\ No newline at end of file
Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -rb28977a121d592ca6b0bf0e5446969ebff7bac1a
--- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision b28977a121d592ca6b0bf0e5446969ebff7bac1a)
@@ -75,7 +75,7 @@
 	               </c:choose>
 	             </fmt:param>
 	             <fmt:param>
-	               <time class="timeago" datetime="<fmt:formatDate value='${currentWikiPage.currentWikiContentDTO.editDate}' pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>"><lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" /></time>
+	               <lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" timeago="true"/>
 	             </fmt:param>
 	           </fmt:message> 
 	         </div> <!-- End last edited -->