diff --git a/.gitignore b/.gitignore
index ed9cd99..a6fedb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
 .tmp*
 .htaccess
 .settings/*
+*~
+*.orig
+git-create-branch-github.sh
+git-create-branch-origin.sh
+framework.config.php
+.project
diff --git a/features/cerberusweb.core/api/uri/display.php b/features/cerberusweb.core/api/uri/display.php
index 868cdc6..438b1a7 100644
--- a/features/cerberusweb.core/api/uri/display.php
+++ b/features/cerberusweb.core/api/uri/display.php
@@ -77,7 +77,7 @@ class ChDisplayPage extends CerberusPageExtension {
 		}
 		
 		$tpl->assign('ticket', $ticket);
-
+		
 		// TicketToolbarItem Extensions
 		$ticketToolbarItems = DevblocksPlatform::getExtensions('cerberusweb.ticket.toolbaritem', true);
 		if(!empty($ticketToolbarItems))
@@ -158,6 +158,26 @@ class ChDisplayPage extends CerberusPageExtension {
 			))
 		);
 		
+		if (class_exists('Extension_TimeTrackingSource',true)):
+			// Adds total time worked per ticket to the token list.
+			$db = DevblocksPlatform::getDatabaseService();
+
+			$sql = "SELECT sum(tte.time_actual_mins) mins ";
+			$sql .= "FROM timetracking_entry tte ";
+			$sql .= sprintf("WHERE tte.source_id =  %d ", $ticket->id);
+			$sql .= "AND tte.source_extension_id = 'timetracking.source.ticket' ";
+			$sql .= "GROUP BY tte.source_id ";
+
+			$rs = $db->Execute($sql);
+		
+			if(is_a($rs,'ADORecordSet')) {
+				$total_time_all = intval($rs->fields['mins']);			
+			} else {
+				$total_time_all = 0;			
+			}
+		endif;
+
+		$tpl->assign('total_time_all', $total_time_all);
 		$tpl->display('file:' . $this->_TPL_PATH . 'display/index.tpl');
 	}
 	
diff --git a/features/cerberusweb.core/templates/display/index.tpl b/features/cerberusweb.core/templates/display/index.tpl
index 4029acc..c7b95a1 100644
--- a/features/cerberusweb.core/templates/display/index.tpl
+++ b/features/cerberusweb.core/templates/display/index.tpl
@@ -18,6 +18,9 @@
 					<b>{$translate->_('common.bucket')|capitalize}:</b> {if !empty($ticket_category_id)}{$ticket_category->name}{else}{$translate->_('common.inbox')|capitalize}{/if} &nbsp; 
 					<b>{$translate->_('ticket.mask')|capitalize}:</b> {$ticket->mask} &nbsp; 
 					<b>{$translate->_('ticket.id')}:</b> {$ticket->id} &nbsp; 
+					{if isset($total_time_all) }
+						<b>Total Ticket Time Worked: </b> {$total_time_all} Mins&nbsp; 
+					{/if}
 					<br>
 					{if !empty($ticket->next_worker_id)}
 						{assign var=next_worker_id value=$ticket->next_worker_id}