From d75f2f476798e5f153b2b83250ab029b11487703 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Tue, 28 Oct 2014 13:18:40 +1300
Subject: [PATCH] remove trailing spaces, swap tabs for double spaces

---
 CRM/Admin/Form/Preferences/Contribute.php     |    4 +-
 .../Form/Setting/UpdateConfigBackend.php      |    4 +-
 CRM/Campaign/Form/Petition.php                |    9 +-
 .../case_sample.mysql.tpl                     |    6 +-
 CRM/Contact/Form/Task/Email.php               |    2 +-
 CRM/Contact/Page/AJAX.php                     |   10 +-
 CRM/Contribute/BAO/ContributionPage.php       |    2 +-
 CRM/Contribute/Form/AdditionalInfo.php        |    2 +-
 CRM/Contribute/Form/Contribution.php          |    4 +-
 .../Form/ContributionPage/Amount.php          |    2 +-
 CRM/Contribute/Form/Task/Invoice.php          |    8 +-
 CRM/Contribute/Task.php                       |    2 +-
 CRM/Core/BAO/RecurringEntity.php              |  142 +--
 CRM/Core/BAO/UFField.php                      |    4 +-
 CRM/Core/DAO/permissions.php                  |    2 +-
 CRM/Core/Form/RecurringEntity.php             |   36 +-
 CRM/Core/Menu.php                             |    2 +-
 CRM/Core/Page/AJAX/RecurringEntity.php        |   10 +-
 CRM/Core/xml/Menu/Admin.xml                   |    2 +-
 CRM/Core/xml/Menu/Contact.xml                 |    2 +-
 CRM/Event/BAO/Event.php                       |    6 +-
 CRM/Event/BAO/Query.php                       |   12 +-
 CRM/Event/Cart/Page/CheckoutAJAX.php          |    2 +-
 CRM/Event/Form/ManageEvent.php                |    6 +-
 CRM/Event/Form/ManageEvent/Fee.php            |    2 +-
 CRM/Event/Form/ManageEvent/Repeat.php         |   84 +-
 CRM/Event/Form/Participant.php                |   24 +-
 CRM/Event/Form/Registration/ThankYou.php      |    2 +-
 CRM/Financial/BAO/FinancialTypeAccount.php    |    4 +-
 CRM/Financial/Form/FinancialAccount.php       |    2 +-
 CRM/Financial/Form/FinancialType.php          |    2 +-
 CRM/Mailing/Form/Settings.php                 |    2 +-
 CRM/Member/Form/Membership.php                |    8 +-
 CRM/Member/Import/Parser/Membership.php       |    4 +-
 CRM/PCP/BAO/PCP.php                           |    5 +-
 CRM/Price/BAO/PriceSet.php                    |    1 -
 CRM/Report/xml/Menu/Report.xml                |    2 +-
 .../event_offline_receipt_html.tpl            |    6 +-
 .../event_offline_receipt_text.tpl            |    2 +-
 .../event_online_receipt_html.tpl             |    6 +-
 .../event_online_receipt_text.tpl             |    2 +-
 .../participant_confirm_html.tpl              |    2 +-
 .../participant_confirm_text.tpl              |    2 +-
 ...sive Design Newsletter - Single Column.tpl |   12 +-
 ...ponsive Design Newsletter - Two Column.tpl | 1058 ++++++++---------
 .../contribution_invoice_receipt_html.tpl     |  590 ++++-----
 .../contribution_invoice_receipt_subject.tpl  |    2 +-
 .../contribution_offline_receipt_html.tpl     |    2 +-
 .../contribution_online_receipt_html.tpl      |    2 +-
 .../event_offline_receipt_html.tpl            |    8 +-
 .../event_offline_receipt_text.tpl            |    2 +-
 .../event_online_receipt_html.tpl             |    8 +-
 .../event_online_receipt_text.tpl             |    2 +-
 .../membership_offline_receipt_html.tpl       |    2 +-
 .../membership_online_receipt_html.tpl        |    2 +-
 CRM/Upgrade/Incremental/sql/4.3.6.mysql.tpl   |   18 +-
 CRM/Upgrade/Incremental/sql/4.4.4.mysql.tpl   |    6 +-
 CRM/Upgrade/Incremental/sql/4.4.5.mysql.tpl   |   10 +-
 .../Incremental/sql/4.5.beta7.mysql.tpl       |    2 +-
 CRM/Utils/Date.php                            |    8 +-
 CRM/Utils/Token.php                           |    4 +-
 templates/CRM/Group/Form/Search.tpl           |    2 +-
 templates/CRM/Price/Form/PriceSet.tpl         |   40 +-
 templates/CRM/Price/Page/Field.tpl            |    2 +-
 templates/CRM/Price/Page/LineItem.tpl         |   30 +-
 65 files changed, 1128 insertions(+), 1127 deletions(-)

diff --git a/CRM/Admin/Form/Preferences/Contribute.php b/CRM/Admin/Form/Preferences/Contribute.php
index 6a31324977..58c51877da 100644
--- a/CRM/Admin/Form/Preferences/Contribute.php
+++ b/CRM/Admin/Form/Preferences/Contribute.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 /**
  * This class generates form components for the display preferences
@@ -88,7 +88,7 @@ class CRM_Admin_Form_Preferences_Contribute extends CRM_Admin_Form_Preferences {
     );
     parent::preProcess();
   }
-  
+
   /**
    * Function to build the form
    *
diff --git a/CRM/Admin/Form/Setting/UpdateConfigBackend.php b/CRM/Admin/Form/Setting/UpdateConfigBackend.php
index 7ea6bde55f..92ab92ee9d 100644
--- a/CRM/Admin/Form/Setting/UpdateConfigBackend.php
+++ b/CRM/Admin/Form/Setting/UpdateConfigBackend.php
@@ -138,8 +138,8 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting
         $val = CRM_Utils_File::addTrailingSlash($val);
       }
     }
-	
-	//CRM-15365 - Fix BaseURL to avoid wrong trailing slash on Windows installs
+
+    //CRM-15365 - Fix BaseURL to avoid wrong trailing slash on Windows installs
     foreach ($params as $name => & $val) {
       if ($val && in_array($name, array('newBaseURL'))) {
         $val = CRM_Utils_File::addTrailingSlash($val,"/");
diff --git a/CRM/Campaign/Form/Petition.php b/CRM/Campaign/Form/Petition.php
index ac75ad73c0..96f81f6e28 100644
--- a/CRM/Campaign/Form/Petition.php
+++ b/CRM/Campaign/Form/Petition.php
@@ -269,18 +269,19 @@ class CRM_Campaign_Form_Petition extends CRM_Core_Form {
 
     if (empty($fields['campaign_id'])) {
       $where[] = 'campaign_id IS NULL';
-    } else {
+    }
+    else {
       $where[] = 'campaign_id = %3';
-      $params[3] = array($fields['campaign_id'], 'Integer');        
+      $params[3] = array($fields['campaign_id'], 'Integer');
       $uniqueRuleErrorMessage = ts('This title is already associated with the selected campaign and activity type. Please specify a unique title.');
     }
 
     // Exclude current Petition row if UPDATE.
     if ($form->_surveyId) {
       $where[] = 'id != %4';
-      $params[4] = array($form->_surveyId, 'Integer');              
+      $params[4] = array($form->_surveyId, 'Integer');
     }
-    
+
     $whereClause = implode(' AND ', $where);
 
     $query = "
diff --git a/CRM/Case/xml/configuration.sample/case_sample.mysql.tpl b/CRM/Case/xml/configuration.sample/case_sample.mysql.tpl
index ed19acdaf0..250709fdec 100644
--- a/CRM/Case/xml/configuration.sample/case_sample.mysql.tpl
+++ b/CRM/Case/xml/configuration.sample/case_sample.mysql.tpl
@@ -35,11 +35,11 @@ SELECT @csgId        := max(id) from civicrm_option_group where name = 'case_sta
   {foreach from=$locales item=locale}
     UPDATE civicrm_option_value SET name = 'Open' where option_group_id = @csgId AND label_{$locale} = 'Ongoing';
     UPDATE civicrm_option_value SET name = 'Closed' where option_group_id = @csgId AND label_{$locale} = 'Resolved';
-  {/foreach}  
+  {/foreach}
 {else}
   UPDATE civicrm_option_value SET name = 'Open' where option_group_id = @csgId AND label = 'Ongoing';
   UPDATE civicrm_option_value SET name = 'Closed' where option_group_id = @csgId AND label = 'Resolved';
-{/if}  
+{/if}
 
 -- /*******************************************************
 -- *
@@ -73,7 +73,7 @@ INSERT INTO `civicrm_option_value` ( `option_group_id`, {localize field='label'}
 INSERT INTO `civicrm_option_value` ( `option_group_id`, {localize field='label'}`label`{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`,  `is_optgroup`, `is_reserved`, `is_active`, `component_id` )
 (SELECT @option_group_id_activity_type, {localize}'{ts escape="sql"}ADC referral{/ts}'{/localize}, (SELECT @max_val := @max_val+1), 'ADC referral',  NULL, 0,  0, (SELECT @max_val := @max_val+1),  0, 0, 1, @caseCompId
  FROM dual WHERE NOT EXISTS (SELECT * FROM `civicrm_option_value`  WHERE `name` = 'ADC referral'));
- 
+
 -- /*******************************************************
 -- *
 -- * Relationship Types
diff --git a/CRM/Contact/Form/Task/Email.php b/CRM/Contact/Form/Task/Email.php
index 37370be64c..f37949250c 100644
--- a/CRM/Contact/Form/Task/Email.php
+++ b/CRM/Contact/Form/Task/Email.php
@@ -129,7 +129,7 @@ class CRM_Contact_Form_Task_Email extends CRM_Contact_Form_Task {
       CRM_Utils_System::setTitle(implode(',', $displayName) . ' - ' . ts('Email'));
     }
     else {
-      CRM_Utils_System::setTitle(ts('New Email'));          
+      CRM_Utils_System::setTitle(ts('New Email'));
     }
     CRM_Contact_Form_Task_EmailCommon::preProcessFromAddress($this);
 
diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index 242eb75c83..f551ae486a 100644
--- a/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@ -647,15 +647,15 @@ ORDER BY sort_name ";
         }
       }
       else {
-      	$cid = CRM_Utils_Array::value('cid', $_GET);
-      	if ($cid) {
+        $cid = CRM_Utils_Array::value('cid', $_GET);
+        if ($cid) {
           //check cid for interger
           $contIDS = explode(',', $cid);
           foreach ($contIDS as $contID) {
             CRM_Utils_Type::escape($contID, 'Integer');
           }
           $queryString = " cc.id IN ( $cid )";
-      	}
+        }
       }
 
       if ($queryString) {
@@ -743,8 +743,8 @@ LIMIT {$offset}, {$rowCount}
       $queryString = " ( cc.sort_name LIKE '%$name%' OR cp.phone LIKE '%$name%' ) ";
     }
     else {
-    	$cid = CRM_Utils_Array::value('cid', $_GET);
-    	if ($cid) {
+      $cid = CRM_Utils_Array::value('cid', $_GET);
+      if ($cid) {
         //check cid for interger
         $contIDS = explode(',', $cid);
         foreach ($contIDS as $contID) {
diff --git a/CRM/Contribute/BAO/ContributionPage.php b/CRM/Contribute/BAO/ContributionPage.php
index f45dbdbede..d175b4db92 100644
--- a/CRM/Contribute/BAO/ContributionPage.php
+++ b/CRM/Contribute/BAO/ContributionPage.php
@@ -399,7 +399,7 @@ class CRM_Contribute_BAO_ContributionPage extends CRM_Contribute_DAO_Contributio
         $prefixValue = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME, 'contribution_invoice_settings');
         $invoicing = CRM_Utils_Array::value('invoicing', $prefixValue);
         if (count($taxAmt) > 0 && (isset($invoicing) && isset($prefixValue['is_email_pdf']))) {
-          $sendTemplateParams['isEmailPdf'] = True; 
+          $sendTemplateParams['isEmailPdf'] = True;
           $sendTemplateParams['contributionId'] = $values['contribution_id'];
         }
         list($sent, $subject, $message, $html) = CRM_Core_BAO_MessageTemplate::sendTemplate($sendTemplateParams);
diff --git a/CRM/Contribute/Form/AdditionalInfo.php b/CRM/Contribute/Form/AdditionalInfo.php
index 0cc1aa02a8..dddd95b464 100644
--- a/CRM/Contribute/Form/AdditionalInfo.php
+++ b/CRM/Contribute/Form/AdditionalInfo.php
@@ -498,7 +498,7 @@ class CRM_Contribute_Form_AdditionalInfo {
      else {
        $isEmailPdf = False;
      }
-     
+
     list($sendReceipt, $subject, $message, $html) = CRM_Core_BAO_MessageTemplate::sendTemplate(
       array(
         'groupName' => 'msg_tpl_workflow_contribution',
diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index 080b9563c9..eb3a6d5ed5 100644
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -1058,7 +1058,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
         $submittedValues, $lineItem[$priceSetId]);
 
       // unset tax amount for offline 'is_quick_config' contribution
-      if ($this->_priceSet['is_quick_config'] && 
+      if ($this->_priceSet['is_quick_config'] &&
         !array_key_exists($submittedValues['financial_type_id'], CRM_Core_PseudoConstant::getTaxRates())
       ) {
         unset($submittedValues['tax_amount']);
@@ -1389,7 +1389,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
           }
         }
       }
-       
+
       if ($invoicing) {
         if ($this->_action & CRM_Core_Action::UPDATE) {
           if (isset($submittedValues['tax_amount'])) {
diff --git a/CRM/Contribute/Form/ContributionPage/Amount.php b/CRM/Contribute/Form/ContributionPage/Amount.php
index 09bd2d4579..3a403f4be0 100644
--- a/CRM/Contribute/Form/ContributionPage/Amount.php
+++ b/CRM/Contribute/Form/ContributionPage/Amount.php
@@ -414,7 +414,7 @@ SELECT id
     // get the submitted form values.
     $params = $this->controller->exportValues($this->_name);
 
-    //update 'is_billing_required' 
+    //update 'is_billing_required'
     if (empty($params['is_pay_later'])) {
       $params['is_billing_required'] = 0;
     }
diff --git a/CRM/Contribute/Form/Task/Invoice.php b/CRM/Contribute/Form/Task/Invoice.php
index 4affdacaeb..e0a413841f 100644
--- a/CRM/Contribute/Form/Task/Invoice.php
+++ b/CRM/Contribute/Form/Task/Invoice.php
@@ -317,7 +317,7 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task {
       $addressParams = array('contact_id' => $contribution->contact_id);
       $addressDetails = CRM_Core_BAO_Address::getValues($addressParams);
 
-      // to get billing address if present 
+      // to get billing address if present
       $billingAddress = array();
       foreach ($addressDetails as $key => $address) {
         if ((isset($address['is_billing']) && $address['is_billing'] == 1) && (isset($address['is_primary']) && $address['is_primary'] == 1) && $address['contact_id'] == $contribution->contact_id) {
@@ -357,10 +357,10 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task {
         $lineItem = CRM_Price_BAO_LineItem::getLineItems($eid, $etable);
       }
 
-      //TO DO: Need to do changes for partially paid to display amount due on PDF invoice 
+      //TO DO: Need to do changes for partially paid to display amount due on PDF invoice
       $amountDue = ($input['amount'] - $input['amount']);
 
-      // retreiving the subtotal and sum of same tax_rate 
+      // retreiving the subtotal and sum of same tax_rate
       $dataArray = array();
       $subTotal = 0;
       foreach ($lineItem as $entity_id => $taxRate) {
@@ -482,7 +482,7 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task {
       if (isset($creditNoteId)) {
         $tplParams['creditnote_id'] = $creditNoteId;
       }
-      
+
       $sendTemplateParams = array(
         'groupName' => 'msg_tpl_workflow_contribution',
         'valueName' => 'contribution_invoice_receipt',
diff --git a/CRM/Contribute/Task.php b/CRM/Contribute/Task.php
index 19495b0763..dabebfaec0 100644
--- a/CRM/Contribute/Task.php
+++ b/CRM/Contribute/Task.php
@@ -126,7 +126,7 @@ class CRM_Contribute_Task {
         unset(self::$_tasks[1]);
       }
 
-      // remove action "Print or Email Contribution Invoices" 
+      // remove action "Print or Email Contribution Invoices"
       $invoiceSettings = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME, 'contribution_invoice_settings');
       $invoicing = CRM_Utils_Array::value('invoicing', $invoiceSettings);
       if (!$invoicing) {
diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php
index e244b06bcd..9ba1049d20 100644
--- a/CRM/Core/BAO/RecurringEntity.php
+++ b/CRM/Core/BAO/RecurringEntity.php
@@ -33,7 +33,7 @@
  *
  */
 
-require_once 'packages/When/When.php'; 
+require_once 'packages/When/When.php';
 
 class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
@@ -45,14 +45,14 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
   public $overwriteColumns = array();
   public $intervalDateColumns = array();
   public $excludeDates = array();
-  
+
   public $linkedEntities = array();
 
   public $isRecurringEntityRecord = TRUE;
 
   protected $recursion = NULL;
 
-  static $_tableDAOMapper = 
+  static $_tableDAOMapper =
     array(
       'civicrm_event'       => 'CRM_Event_DAO_Event',
       'civicrm_price_set_entity' => 'CRM_Price_DAO_PriceSetEntity',
@@ -63,7 +63,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
       'civicrm_activity_contact'  => 'CRM_Activity_DAO_ActivityContact',
     );
 
-  static $_updateSkipFields = 
+  static $_updateSkipFields =
     array(
       'civicrm_event'       => array('start_date', 'end_date'),
       'civicrm_tell_friend' => array('entity_id'),
@@ -71,27 +71,27 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
       'civicrm_activity'    => array('activity_date_time'),
     );
 
-  static $_linkedEntitiesInfo = 
+  static $_linkedEntitiesInfo =
     array(
       'civicrm_tell_friend' => array(
-        'entity_id_col'    => 'entity_id', 
+        'entity_id_col'    => 'entity_id',
         'entity_table_col' => 'entity_table'
       ),
       'civicrm_price_set_entity' => array(
-        'entity_id_col'    => 'entity_id', 
+        'entity_id_col'    => 'entity_id',
         'entity_table_col' => 'entity_table',
         'is_multirecord'   => TRUE,
       ),
       'civicrm_uf_join' => array(
-        'entity_id_col'    => 'entity_id', 
+        'entity_id_col'    => 'entity_id',
         'entity_table_col' => 'entity_table'
       ),
       'civicrm_pcp_block' => array(
-        'entity_id_col'    => 'entity_id', 
+        'entity_id_col'    => 'entity_id',
         'entity_table_col' => 'entity_table'
       ),
     );
-  
+
   /**
    * Function to save records in civicrm_recujrring_entity table
    *
@@ -137,7 +137,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
    * @return object
    */
   static function quickAdd($parentId, $entityId, $entityTable) {
-    $params = 
+    $params =
       array(
         'parent_id'    => $parentId,
         'entity_id'    => $entityId,
@@ -170,7 +170,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
   /**
    * This function generates all new entities based on object vars
-   * 
+   *
    * @return array
    */
   function generate() {
@@ -181,12 +181,12 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
   /**
    * This function builds a "When" object based on schedule/reminder params
-   * 
+   *
    * @return object When object
    */
   function generateRecursion() {
     // return if already generated
-    if (is_a($this->recursion, 'When')) { 
+    if (is_a($this->recursion, 'When')) {
       return $this->recursion;
     }
 
@@ -206,7 +206,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
   /**
    * Generate new DAOs and along with entries in civicrm_recurring_entity table
-   * 
+   *
    * @return array
    */
   function generateEntities() {
@@ -233,7 +233,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
           $newCriteria[$col] = $val;
         }
         // create main entities
-        $obj = CRM_Core_BAO_RecurringEntity::copyCreateEntity($this->entity_table, 
+        $obj = CRM_Core_BAO_RecurringEntity::copyCreateEntity($this->entity_table,
           $findCriteria,
           $newCriteria,
           $this->isRecurringEntityRecord
@@ -248,7 +248,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
               $newCriteria[$col] = $obj->id;
             }
             // create linked entities
-            $linkedObj = CRM_Core_BAO_RecurringEntity::copyCreateEntity($linkedInfo['table'], 
+            $linkedObj = CRM_Core_BAO_RecurringEntity::copyCreateEntity($linkedInfo['table'],
               $linkedInfo['findCriteria'],
               $newCriteria,
               CRM_Utils_Array::value('isRecurringEntityRecord', $linkedInfo, TRUE)
@@ -267,16 +267,16 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
   }
 
   /**
-   * This function iterates through when object criterias and 
+   * This function iterates through when object criterias and
    * generates recursive dates based on that
-   * 
+   *
    * @return array array of dates
    */
   function generateRecursiveDates() {
     $this->generateRecursion();
 
     $recursionDates = array();
-    if (is_a($this->recursion, 'When')) { 
+    if (is_a($this->recursion, 'When')) {
       $initialCount = CRM_Utils_Array::value('start_action_offset', $this->schedule);
 
       $exRangeStart = $exRangeEnd = NULL;
@@ -340,16 +340,16 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
   /**
    * This function gets all the children for a particular parent entity
-   * 
+   *
    * @param int $parentId Parent entity id
    * @param string $entityTable Name of the entity table
    * @param boolean $includeParent If true parent id is included in result set and vice versa
    * @param int $mode 1. retrieve only one entity. 2. retrieve all future entities in the repeating set. 3. all entities in the repeating set.
    * @param int $initiatorId the instance where this function is invoked from
-   * 
+   *
    * @access public
    * @static
-   * 
+   *
    * @return array an array of child ids
    */
   static public function getEntitiesForParent($parentId, $entityTable, $includeParent = TRUE, $mode = 3, $initiatorId = NULL) {
@@ -360,7 +360,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
     if (!$initiatorId) {
       $initiatorId = $parentId;
-    } 
+    }
 
     $queryParams = array(
       1 => array($parentId,    'Integer'),
@@ -386,7 +386,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
       $recurringEntityID = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_recurring_entity WHERE entity_id = %3 AND entity_table = %2", $queryParams);
       if ($recurringEntityID) {
         $query .= $includeParent ? " AND id >= %4" : " AND id > %4";
-        $query .= " ORDER BY id ASC"; // FIXME: change to order by dates  
+        $query .= " ORDER BY id ASC"; // FIXME: change to order by dates
         $queryParams[4] = array($recurringEntityID, 'Integer');
       }
       else {
@@ -404,17 +404,17 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
   }
 
   /**
-   * This function when passed an entity id checks if it has parent and 
+   * This function when passed an entity id checks if it has parent and
    * returns all other entities that are connected to same parent.
-   * 
+   *
    * @param int $entityId entity id
    * @param string $entityTable Entity table name
    * @param boolean $includeParent Include parent in result set
    * @param int $mode 1. retrieve only one entity. 2. retrieve all future entities in the repeating set. 3. all entities in the repeating set.
-   * 
+   *
    * @access public
    * @static
-   * 
+   *
    * @return array array of connected ids
    */
   static public function getEntitiesFor($entityId, $entityTable, $includeParent = TRUE, $mode = 3) {
@@ -427,15 +427,15 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
   /**
    * This function gets the parent for the entity id passed to it
-   * 
+   *
    * @param int $entityId entity ID
    * @param string $entityTable Entity table name
    * @param boolean $includeParent Include parent in result set
-   * 
+   *
    * @access public
    * @static
-   * 
-   * @return int unsigned $parentId Parent ID 
+   *
+   * @return int unsigned $parentId Parent ID
    */
   static public function getParentFor($entityId, $entityTable, $includeParent = TRUE) {
     if (empty($entityId) || empty($entityTable)) {
@@ -443,13 +443,13 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
     }
 
     $query = "
-      SELECT parent_id 
+      SELECT parent_id
       FROM civicrm_recurring_entity
       WHERE entity_id = %1 AND entity_table = %2";
     if (!$includeParent) {
       $query .= " AND parent_id != %1";
     }
-    $parentId = 
+    $parentId =
       CRM_Core_DAO::singleValueQuery($query,
         array(
           1 => array($entityId, 'Integer'),
@@ -461,15 +461,15 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
   /**
    * This function copies the information from parent entity and creates other entities with same information
-   * 
+   *
    * @param string $entityTable Entity table name
    * @param array $fromCriteria array of all the fields & values on which basis to copy
    * @param array $newParams  array of all the fields & values to be copied besides the other fields
    * @param boolean $createRecurringEntity if to create a record in recurring_entity table
-   * 
+   *
    * @access public
    * @static
-   * 
+   *
    * @return object
    */
   static public function copyCreateEntity($entityTable, $fromCriteria, $newParams, $createRecurringEntity = TRUE) {
@@ -494,12 +494,12 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
   /**
    * This function acts as a listener to dao->update whenever there is an update,
    * and propagates any changes to all related entities present in recurring entity table
-   * 
+   *
    * @param object $event An object of /Civi/Core/DAO/Event/PostUpdate containing dao object that was just updated
-   *   
+   *
    * @access public
    * @static
-   *                          
+   *
    * @return void
    */
   static public function triggerUpdate($event) {
@@ -518,7 +518,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
       return FALSE;
     }
     $key = "{$obj->__table}_{$obj->id}";
-    
+
     if (array_key_exists($key, $processedEntities)) {
       // already processed
       return NULL;
@@ -567,12 +567,12 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
   /**
    * This function acts as a listener to dao->save,
    * and creates entries for linked entities in recurring entity table
-   * 
+   *
    * @param object $event An object of /Civi/Core/DAO/Event/PostUpdate containing dao object that was just inserted
-   *   
+   *
    * @access public
    * @static
-   *                          
+   *
    * @return void
    */
   static public function triggerInsert($event) {
@@ -595,7 +595,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
       return FALSE;
     }
     $key = "{$obj->__table}_{$obj->id}";
-    
+
     if (array_key_exists($key, $processedEntities)) {
       // already being processed. Exit recursive calls.
       return NULL;
@@ -653,7 +653,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
                   $idCol    => $val['id'],
                   $tableCol => $val['table']
                 );
-                $linkedObj = CRM_Core_BAO_RecurringEntity::copyCreateEntity($obj->__table, 
+                $linkedObj = CRM_Core_BAO_RecurringEntity::copyCreateEntity($obj->__table,
                   array('id' => $obj->id),
                   $newCriteria,
                   TRUE
@@ -674,12 +674,12 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
   /**
    * This function acts as a listener to dao->delete, and deletes an entry from recurring_entity table
-   * 
+   *
    * @param object $event An object of /Civi/Core/DAO/Event/PostUpdate containing dao object that was just deleted
    *
    * @access public
    * @static
-   *                          
+   *
    * @return void
    */
   static public function triggerDelete($event) {
@@ -719,12 +719,12 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
   /**
    * This function maps values posted from form to civicrm_action_schedule columns
-   * 
+   *
    * @param array $formParams and array of form values posted
-   * 
-   * @return array 
+   *
+   * @return array
    */
-  function mapFormValuesToDB($formParams = array()) {   
+  function mapFormValuesToDB($formParams = array()) {
     $dbParams = array();
     if (CRM_Utils_Array::value('used_for', $formParams)) {
       $dbParams['used_for'] = $formParams['used_for'];
@@ -774,14 +774,14 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
       }
     }
 
-    //For "Ends" - After: 
+    //For "Ends" - After:
     if ($formParams['ends'] == 1) {
       if (CRM_Utils_Array::value('start_action_offset', $formParams)) {
         $dbParams['start_action_offset'] = $formParams['start_action_offset'];
       }
     }
 
-    //For "Ends" - On: 
+    //For "Ends" - On:
     if ($formParams['ends'] == 2) {
       if (CRM_Utils_Array::value('repeat_absolute_date', $formParams)) {
         $dbParams['absolute_date'] = CRM_Utils_Date::processDate($formParams['repeat_absolute_date']);
@@ -792,12 +792,12 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
   /**
    * This function gets all the columns of civicrm_action_schedule table based on id(primary key)
-   * 
+   *
    * @param int $scheduleReminderId primary key of civicrm_action_schedule table
-   * 
+   *
    * @access public
    * @static
-   * 
+   *
    * @return object
    */
   static public function getScheduleReminderDetailsById($scheduleReminderId) {
@@ -818,9 +818,9 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
   /**
    * This function is a wrapper of getScheduleReminderDetailsById function
-   * 
+   *
    * @param int $scheduleReminderId primary key of civicrm_action_schedule table
-   * 
+   *
    * @return array
    */
   function getScheduleParams($scheduleReminderId) {
@@ -836,9 +836,9 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
   /**
    * This function takes criterias saved in civicrm_action_schedule table
    * and creates recursion rule
-   * 
+   *
    * @param array $scheduleReminderDetails array of repeat criterias saved in civicrm_action_schedule table
-   * 
+   *
    * @return object When object
    */
   function getRecursionFromSchedule($scheduleReminderDetails = array()) {
@@ -881,7 +881,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
         }
       }
 
-      //month 
+      //month
       if ($scheduleReminderDetails['repetition_frequency_unit'] == 'month') {
         if ($scheduleReminderDetails['entity_status']) {
           $startActionDate = explode(" ", $scheduleReminderDetails['entity_status']);
@@ -933,19 +933,19 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
     }
     return $r;
   }
-  
+
   /**
    * This function gets time difference between the two datetime object
-   * 
+   *
    * @param DateTime $startDate Start Date
    * @param DateTime $endDate End Date
-   * 
+   *
    * @access public
    * @static
-   * 
+   *
    * @return object DateTime object which contain time difference
    */
-  static public function getInterval($startDate, $endDate) { 
+  static public function getInterval($startDate, $endDate) {
     if ($startDate && $endDate) {
       $startDate = new DateTime($startDate);
       $endDate   = new DateTime($endDate);
@@ -955,13 +955,13 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
   /**
    * This function deletes all the other entities that are related to it
-   * 
+   *
    * @param int $entityId Entity id
    * @param string $entityTable Name of the entity table
-   * 
+   *
    * @access public
    * @static
-   * 
+   *
    * @return boolean|object Returns either boolean value or CRM_Core_DAO_RecurringEntity object
    */
   static public function delEntityRelations($entityId, $entityTable) {
diff --git a/CRM/Core/BAO/UFField.php b/CRM/Core/BAO/UFField.php
index 6c1189caca..25f556d070 100644
--- a/CRM/Core/BAO/UFField.php
+++ b/CRM/Core/BAO/UFField.php
@@ -859,8 +859,8 @@ SELECT  id
     ) {
       $profileAddressFields[$prefixName] = $index;
     }
-    
-    $potentiallyMissingRequiredFields = array_diff($requiredBillingFields, $requiredProfileFields);    
+
+    $potentiallyMissingRequiredFields = array_diff($requiredBillingFields, $requiredProfileFields);
     CRM_Core_Resources::singleton()->addSetting(array('billing' => array('billingProfileIsHideable' => empty($potentiallyMissingRequiredFields))));
   }
 
diff --git a/CRM/Core/DAO/permissions.php b/CRM/Core/DAO/permissions.php
index 7c304efac1..66ef77def0 100644
--- a/CRM/Core/DAO/permissions.php
+++ b/CRM/Core/DAO/permissions.php
@@ -122,7 +122,7 @@ function _civicrm_api3_permissions($entity, $action, &$params) {
       'edit all contacts',
     ),
   );
-  
+
   // Activity permissions
   $permissions['activity'] = array(
     'delete' => array(
diff --git a/CRM/Core/Form/RecurringEntity.php b/CRM/Core/Form/RecurringEntity.php
index 38937fcf43..9f6654a98a 100644
--- a/CRM/Core/Form/RecurringEntity.php
+++ b/CRM/Core/Form/RecurringEntity.php
@@ -42,12 +42,12 @@ class CRM_Core_Form_RecurringEntity {
    *  Current entity id
    */
   protected static $_entityId = NULL;
-  
+
   static function buildQuickForm(&$form) {
     //$attributes_schedule = CRM_Core_DAO::getAttribute('CRM_Core_DAO_ActionMapping');
     self::$_entityId = CRM_Utils_Array::value('id', $_GET);
     $form->assign('currentEntityId', self::$_entityId);
-    
+
     $form->_freqUnits = array('hour' => 'hour') + CRM_Core_OptionGroup::values('recur_frequency_units');
     foreach ($form->_freqUnits as $val => $label) {
       if ($label == "day") {
@@ -96,8 +96,8 @@ class CRM_Core_Form_RecurringEntity {
     $form->addDate('exclude_date', ts('Exclude Date(s)'), FALSE);
     $select = $form->add('select', 'exclude_date_list', ts(''), $form->_excludeDateInfo, FALSE, array('style' => 'width:150px;', 'size' => 4));
     $select->setMultiple(TRUE);
-    $form->addElement('button','add_to_exclude_list','>>','onClick="addToExcludeList(document.getElementById(\'exclude_date\').value);"'); 
-    $form->addElement('button','remove_from_exclude_list', '<<', 'onClick="removeFromExcludeList(\'exclude_date_list\')"'); 
+    $form->addElement('button','add_to_exclude_list','>>','onClick="addToExcludeList(document.getElementById(\'exclude_date\').value);"');
+    $form->addElement('button','remove_from_exclude_list', '<<', 'onClick="removeFromExcludeList(\'exclude_date_list\')"');
     $form->addElement('hidden', 'isChangeInRepeatConfiguration', '', array('id' => 'isChangeInRepeatConfiguration'));
     $form->addElement('hidden', 'copyExcludeDates', '', array('id' => 'copyExcludeDates'));
     $form->addButtons(array(
@@ -126,7 +126,7 @@ class CRM_Core_Form_RecurringEntity {
   static function formRule($values) {
     $errors = array();
     $dayOfTheWeek = array(monday,tuesday,wednesday,thursday,friday,saturday,sunday);
-    
+
     //Repeats
     if (!CRM_Utils_Array::value('repetition_frequency_unit', $values)) {
       $errors['repetition_frequency_unit'] = ts('This is a required field');
@@ -161,7 +161,7 @@ class CRM_Core_Form_RecurringEntity {
     else {
       $errors['ends'] = ts('This is a required field');
     }
-    
+
     //Repeats BY
     if (CRM_Utils_Array::value('repeats_by', $values)) {
       if ($values['repeats_by'] == 1) {
@@ -208,7 +208,7 @@ class CRM_Core_Form_RecurringEntity {
     if (!empty($type)) {
       $params['used_for'] = $type;
     }
-    
+
     //Save post params to the schedule reminder table
     $dbParams = CRM_Core_BAO_RecurringEntity::mapFormValuesToDB($params);
 
@@ -218,10 +218,10 @@ class CRM_Core_Form_RecurringEntity {
       unset($params['id']);
     }
     $actionScheduleObj = CRM_Core_BAO_ActionSchedule::add($dbParams);
-    
-    //exclude dates 
+
+    //exclude dates
     $excludeDateList = array();
-    if (CRM_Utils_Array::value('copyExcludeDates', $params) && CRM_Utils_Array::value('parent_event_id', $params)) {   
+    if (CRM_Utils_Array::value('copyExcludeDates', $params) && CRM_Utils_Array::value('parent_event_id', $params)) {
       //Since we get comma separated values lets get them in array
       $exclude_date_list = array();
       $exclude_date_list = explode(",", $params['copyExcludeDates']);
@@ -235,7 +235,7 @@ class CRM_Core_Form_RecurringEntity {
       if ($optionGroupIdExists) {
         CRM_Core_BAO_OptionGroup::del($optionGroupIdExists);
       }
-      $optionGroupParams = 
+      $optionGroupParams =
           array(
             'name'        => 'event_repeat_exclude_dates_'.$params['parent_event_id'],
             'title'       => 'Event Recursion',
@@ -247,7 +247,7 @@ class CRM_Core_Form_RecurringEntity {
         $oldWeight= 0;
         $fieldValues = array('option_group_id' => $opGroup->id);
         foreach($exclude_date_list as $val) {
-          $optionGroupValue = 
+          $optionGroupValue =
               array(
                 'option_group_id' =>  $opGroup->id,
                 'label'           =>  CRM_Utils_Date::processDate($val),
@@ -296,7 +296,7 @@ class CRM_Core_Form_RecurringEntity {
       array(
         'table'         => 'civicrm_price_set_entity',
         'findCriteria'  => array(
-          'entity_id'    => $recursion->entity_id, 
+          'entity_id'    => $recursion->entity_id,
           'entity_table' => 'civicrm_event'
         ),
         'linkedColumns' => array('entity_id'),
@@ -305,7 +305,7 @@ class CRM_Core_Form_RecurringEntity {
       array(
         'table'         => 'civicrm_uf_join',
         'findCriteria'  => array(
-          'entity_id'    => $recursion->entity_id, 
+          'entity_id'    => $recursion->entity_id,
           'entity_table' => 'civicrm_event'
         ),
         'linkedColumns' => array('entity_id'),
@@ -314,7 +314,7 @@ class CRM_Core_Form_RecurringEntity {
       array(
         'table'         => 'civicrm_tell_friend',
         'findCriteria'  => array(
-          'entity_id'    => $recursion->entity_id, 
+          'entity_id'    => $recursion->entity_id,
           'entity_table' => 'civicrm_event'
         ),
         'linkedColumns' => array('entity_id'),
@@ -323,7 +323,7 @@ class CRM_Core_Form_RecurringEntity {
       array(
         'table'         => 'civicrm_pcp_block',
         'findCriteria'  => array(
-          'entity_id'    => $recursion->entity_id, 
+          'entity_id'    => $recursion->entity_id,
           'entity_table' => 'civicrm_event'
         ),
         'linkedColumns' => array('entity_id'),
@@ -331,7 +331,7 @@ class CRM_Core_Form_RecurringEntity {
       ),
     );
 
-    $recurResult = $recursion->generate(); 
+    $recurResult = $recursion->generate();
 
     $status = ts('Repeat Configuration has been saved');
     CRM_Core_Session::setStatus($status, ts('Saved'), 'success');
@@ -347,5 +347,5 @@ class CRM_Core_Form_RecurringEntity {
   public function getTitle() {
     return ts('Repeat Event');
   }
-     
+
 }
diff --git a/CRM/Core/Menu.php b/CRM/Core/Menu.php
index e548e2cf65..e5efcec174 100644
--- a/CRM/Core/Menu.php
+++ b/CRM/Core/Menu.php
@@ -322,7 +322,7 @@ class CRM_Core_Menu {
             ',' => '_', '/' => '_',
           )
         ),
-        'url' => CRM_Utils_System::url($path, $query, 
+        'url' => CRM_Utils_System::url($path, $query,
             FALSE, // absolute
             NULL, // fragment
             TRUE, // htmlize
diff --git a/CRM/Core/Page/AJAX/RecurringEntity.php b/CRM/Core/Page/AJAX/RecurringEntity.php
index d6536a8e0d..dbdfcdc7a2 100644
--- a/CRM/Core/Page/AJAX/RecurringEntity.php
+++ b/CRM/Core/Page/AJAX/RecurringEntity.php
@@ -13,10 +13,10 @@
  */
 
 class CRM_Core_Page_AJAX_RecurringEntity {
-  
+
   public static function updateMode() {
     if (CRM_Utils_Array::value('mode', $_REQUEST) && CRM_Utils_Array::value('entityId', $_REQUEST) && CRM_Utils_Array::value('entityTable', $_REQUEST)) {
-      
+
       $finalResult = array();
       $mode = CRM_Utils_Type::escape($_REQUEST['mode'], 'Integer');
       $entityId = CRM_Utils_Type::escape($_REQUEST['entityId'], 'Integer');
@@ -36,7 +36,7 @@ class CRM_Core_Page_AJAX_RecurringEntity {
         $dao->entity_id = $entityId;
         $dao->entity_table = $entityTable;
       }
-      
+
       if ($dao->find(TRUE)) {
         $dao->mode = $mode;
         $dao->save();
@@ -49,7 +49,7 @@ class CRM_Core_Page_AJAX_RecurringEntity {
     echo json_encode($finalResult);
     CRM_Utils_System::civiExit();
   }
-  
+
   public static function generatePreview() {
     $params = $formValues = $genericResult = array();
     $formValues = $_REQUEST;
@@ -74,7 +74,7 @@ class CRM_Core_Page_AJAX_RecurringEntity {
         $recursion->intervalDateColumns = array('end_date' => $interval);
       }
 
-      $result = $recursion->generateRecursiveDates(); 
+      $result = $recursion->generateRecursiveDates();
 
       foreach ($result as $key => $value) {
         $result[$key]['start_date'] = date('M d, Y h:i:s A \o\n l', strtotime($value['start_date']));
diff --git a/CRM/Core/xml/Menu/Admin.xml b/CRM/Core/xml/Menu/Admin.xml
index 14bfe7cc68..a414a9d58f 100644
--- a/CRM/Core/xml/Menu/Admin.xml
+++ b/CRM/Core/xml/Menu/Admin.xml
@@ -475,7 +475,7 @@
   <item>
      <path>civicrm/admin/setting/misc</path>
      <title>Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)</title>
-   	 <desc>Enable undelete/move to trash feature, detailed change logging, ReCAPTCHA to protect forms.</desc>
+     <desc>Enable undelete/move to trash feature, detailed change logging, ReCAPTCHA to protect forms.</desc>
      <page_callback>CRM_Admin_Form_Setting_Miscellaneous</page_callback>
      <adminGroup>System Settings</adminGroup>
      <icon>admin/small/36.png</icon>
diff --git a/CRM/Core/xml/Menu/Contact.xml b/CRM/Core/xml/Menu/Contact.xml
index eeb9a98e72..bad8cc3f32 100644
--- a/CRM/Core/xml/Menu/Contact.xml
+++ b/CRM/Core/xml/Menu/Contact.xml
@@ -47,7 +47,7 @@
      <title>Get Image File</title>
      <page_callback>CRM_Contact_Page_ImageFile</page_callback>
      <access_arguments>*always allow*</access_arguments>
-  </item>  
+  </item>
   <item>
      <path>civicrm/contact/search/basic</path>
      <title>Find Contacts</title>
diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php
index a427b5a4dd..41d88e3452 100644
--- a/CRM/Event/BAO/Event.php
+++ b/CRM/Event/BAO/Event.php
@@ -1227,7 +1227,7 @@ WHERE civicrm_event.is_active = 1
           $invoicing = CRM_Utils_Array::value('invoicing', $prefixValue);
           if ($taxAmt && (isset($invoicing) && isset($prefixValue['is_email_pdf'])) ) {
             $sendTemplateParams['isEmailPdf'] = True;
-            $sendTemplateParams['contributionId'] = $values['contributionId'];    
+            $sendTemplateParams['contributionId'] = $values['contributionId'];
           }
           CRM_Core_BAO_MessageTemplate::sendTemplate($sendTemplateParams);
         }
@@ -2200,5 +2200,5 @@ LEFT  JOIN  civicrm_price_field_value value ON ( value.id = lineItem.price_field
     }
     return CRM_Core_PseudoConstant::get(__CLASS__, $fieldName, $params, $context);
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/CRM/Event/BAO/Query.php b/CRM/Event/BAO/Query.php
index a3379d942e..52800ef9fb 100644
--- a/CRM/Event/BAO/Query.php
+++ b/CRM/Event/BAO/Query.php
@@ -206,7 +206,7 @@ class CRM_Event_BAO_Query {
       }
     }
   }
-  
+
 
   /**
    * @param $query
@@ -249,14 +249,14 @@ class CRM_Event_BAO_Query {
           'civicrm_event', 'event_end_date', 'end_date', 'End Date'
         );
         return;
-        
+
       case 'event_id':
         $query->_where[$grouping][] = "civicrm_event.id $op {$value}";
         $eventTitle = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $value, 'title');
         $query->_qill[$grouping][] = ts('Event') . " $op {$eventTitle}";
         $query->_tables['civicrm_event'] = $query->_whereTables['civicrm_event'] = 1;
         return;
-        
+
       case 'event_include_repeating_events':
         /**
          * Include Repeating Events
@@ -292,7 +292,7 @@ class CRM_Event_BAO_Query {
         $query->_qill[$grouping][] = ts('Include Repeating Events (If Any) ') . " = TRUE";
         $query->_tables['civicrm_event'] = $query->_whereTables['civicrm_event'] = 1;
         return;
-       
+
       case 'event_type_id':
 
         $eventTypes = CRM_Core_OptionGroup::values("event_type");
@@ -300,7 +300,7 @@ class CRM_Event_BAO_Query {
         $query->_qill[$grouping][] = ts('Event Type - %1', array(1 => $eventTypes[$value]));
         $query->_tables['civicrm_event'] = $query->_whereTables['civicrm_event'] = 1;
         return;
-        
+
       case 'participant_test':
         // We dont want to include all tests for sql OR CRM-7827
         if (!$value || $query->getOperator() != 'OR') {
@@ -676,7 +676,7 @@ class CRM_Event_BAO_Query {
     }
 
     CRM_Campaign_BAO_Campaign::addCampaignInComponentSearch($form, 'participant_campaign_id');
-    
+
     $form->assign('validCiviEvent', TRUE);
     $form->setDefaults(array('participant_test' => 0));
   }
diff --git a/CRM/Event/Cart/Page/CheckoutAJAX.php b/CRM/Event/Cart/Page/CheckoutAJAX.php
index bef47d294f..5ec911ec23 100644
--- a/CRM/Event/Cart/Page/CheckoutAJAX.php
+++ b/CRM/Event/Cart/Page/CheckoutAJAX.php
@@ -12,7 +12,7 @@ class CRM_Event_Cart_Page_CheckoutAJAX {
 
     $cart = CRM_Event_Cart_BAO_Cart::find_by_id($_GET['cart_id']);
 
-	  $params_array = array('cart_id' => $cart->id, 'contact_id' => CRM_Event_Cart_Form_Cart::find_or_create_contact(), 'event_id' => $event_id);
+    $params_array = array('cart_id' => $cart->id, 'contact_id' => CRM_Event_Cart_Form_Cart::find_or_create_contact(), 'event_id' => $event_id);
 
     //XXX security?
     $participant = CRM_Event_Cart_BAO_MerParticipant::create($params_array);
diff --git a/CRM/Event/Form/ManageEvent.php b/CRM/Event/Form/ManageEvent.php
index 76c60bf161..228be2b8be 100644
--- a/CRM/Event/Form/ManageEvent.php
+++ b/CRM/Event/Form/ManageEvent.php
@@ -84,7 +84,7 @@ class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
    * the participant records
    */
   protected $_campaignID = NULL;
-  
+
   /**
    * Check if repeating event
    */
@@ -101,7 +101,7 @@ class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
     if (in_array('CiviEvent', $config->enableComponents)) {
       $this->assign('CiviEvent', TRUE);
     }
-      
+
     $this->_action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE, 'add', 'REQUEST');
 
     $this->assign('action', $this->_action);
@@ -187,7 +187,7 @@ class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
     }
 
     $this->_templateId = (int) CRM_Utils_Request::retrieve('template_id', 'Integer', $this);
-    
+
     //Is a repeating event
     if ($this->_isRepeatingEvent) {
       $isRepeat = 'repeat';
diff --git a/CRM/Event/Form/ManageEvent/Fee.php b/CRM/Event/Form/ManageEvent/Fee.php
index 6270d7f3ab..bfe253f22c 100644
--- a/CRM/Event/Form/ManageEvent/Fee.php
+++ b/CRM/Event/Form/ManageEvent/Fee.php
@@ -796,7 +796,7 @@ class CRM_Event_Form_ManageEvent_Fee extends CRM_Event_Form_ManageEvent {
       $params['is_billing_required'] = 0;
     }
 
-    //update 'is_billing_required' 
+    //update 'is_billing_required'
     if (empty($params['is_pay_later'])) {
       $params['is_billing_required'] = False;
     }
diff --git a/CRM/Event/Form/ManageEvent/Repeat.php b/CRM/Event/Form/ManageEvent/Repeat.php
index 93a0965a3a..436963eacd 100644
--- a/CRM/Event/Form/ManageEvent/Repeat.php
+++ b/CRM/Event/Form/ManageEvent/Repeat.php
@@ -12,52 +12,52 @@
  * @author Priyanka
  */
 class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
-  
+
   /**
    * Schedule Reminder Id
    */
   protected $_scheduleReminderId = NULL;
-  
+
   /**
    * Schedule Reminder data
    */
   protected $_scheduleReminderDetails = array();
-  
+
   /**
    *  Parent Event ID
    */
   protected $_parentEventId = NULL;
-  
+
   /**
    * Parent Event Start Date
    */
   protected $_parentEventStartDate = NULL;
-  
+
   /**
    * Parent Event End Date
    */
   protected $_parentEventEndDate = NULL;
-  
+
   /**
-   * Exclude date information 
+   * Exclude date information
    */
   public $_excludeDateInfo = array();
-  
+
   protected $_pager = NULL;
-  
-  
-  
+
+
+
   function preProcess() {
     parent::preProcess();
     $this->assign('currentEventId', $this->_id);
-    
+
     $checkParentExistsForThisId = CRM_Core_BAO_RecurringEntity::getParentFor($this->_id, 'civicrm_event');
     $checkParentExistsForThisId;
     //If this ID has parent, send parent id
     if ($checkParentExistsForThisId) {
       $this->_scheduleReminderDetails = self::getReminderDetailsByEventId($checkParentExistsForThisId, 'event');
       $this->_parentEventId = $checkParentExistsForThisId;
-      
+
       /**
      * Get connected event information list
      */
@@ -86,7 +86,7 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
               CRM_Core_DAO::storeValues($dao, $manageEvent[$dao->id]);
             }
           }
-        }  
+        }
         $this->assign('rows', $manageEvent);
       }
     }
@@ -107,7 +107,7 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
     $parentEventAttributes = CRM_Core_DAO::commonRetrieve('CRM_Event_DAO_Event', $parentEventParams, $parentEventValues, $parentEventReturnProperties);
     $this->_parentEventStartDate = $parentEventAttributes->start_date;
     $this->_parentEventEndDate = $parentEventAttributes->end_date;
-    
+
     //Get option exclude date information
     //$groupId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionGroup', 'event_repeat_exclude_dates_'.$this->_parentEventId, 'id', 'name');
     CRM_Core_OptionValue::getValues(array('name' => 'event_repeat_exclude_dates_'.$this->_parentEventId), $optionValue);
@@ -117,9 +117,9 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
         $excludeOptionValues[$val['value']] = date('m/d/Y', strtotime($val['value']));
       }
       $this->_excludeDateInfo = $excludeOptionValues;
-    } 
+    }
   }
-  
+
   /**
    * This function sets the default values for the form. For edit/view mode
    * the default values are retrieved from the database
@@ -130,7 +130,7 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
    */
   function setDefaultValues() {
     $defaults = array();
-    
+
     //Set Schedule Reminder Id
     if (property_exists($this->_scheduleReminderDetails, 'id')) {
       $this->_scheduleReminderId = $this->_scheduleReminderDetails->id;
@@ -138,7 +138,7 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
     //Always pass current event's start date by default
     $currentEventStartDate = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $this->_id, 'start_date', 'id');
     list($defaults['repetition_start_date'], $defaults['repetition_start_date_time']) = CRM_Utils_Date::setDateDefaults($currentEventStartDate, 'activityDateTime');
-    
+
     // Check if there is id for this event in Reminder table
     if ($this->_scheduleReminderId) {
       $defaults['repetition_frequency_unit'] = $this->_scheduleReminderDetails->repetition_frequency_unit;
@@ -170,45 +170,45 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
       if ($this->_scheduleReminderDetails->entity_status) {
         $defaults['repeats_by'] = 2;
       }
-    } 
+    }
     return $defaults;
   }
-  
+
   public function buildQuickForm() {
     CRM_Core_Form_RecurringEntity::buildQuickForm($this);
   }
-   
+
   public function postProcess() {
     if ($this->_id) {
-      $params = $this->controller->exportValues($this->_name); 
+      $params = $this->controller->exportValues($this->_name);
       $params['event_id'] = $this->_id;
       $params['parent_event_id']  = $this->_parentEventId;
       $params['parent_event_start_date'] = $this->_parentEventStartDate;
       $params['parent_event_end_date'] = $this->_parentEventEndDate;
       //Unset event id
       unset($params['id']);
-      
+
       //Set Schedule Reminder id
       $params['id'] = $this->_scheduleReminderId;
       $url = 'civicrm/event/manage/repeat';
       $urlParams = "action=update&reset=1&id={$this->_id}";
-      
+
       CRM_Core_Form_RecurringEntity::postProcess($params, 'event');
       CRM_Utils_System::redirect(CRM_Utils_System::url($url, $urlParams));
     }
     else {
         CRM_Core_Error::fatal("Could not find Event ID");
-    }  
+    }
   }
-  
+
    /**
    * This function gets the number of participant count for the list of related event ids
-   * 
+   *
    * @param array $listOfRelatedEntities list of related event ids
-   * 
+   *
    * @access public
    * @static
-   * 
+   *
    * @return array
    */
   static public function getParticipantCountforEvent($listOfRelatedEntities = array()) {
@@ -217,10 +217,10 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
         return $entity['id'];
       }, $listOfRelatedEntities));
       if ($implodeRelatedEntities) {
-        $query = "SELECT p.event_id as event_id, 
-          concat_ws(' ', e.title, concat_ws(' - ', DATE_FORMAT(e.start_date, '%b %d %Y %h:%i %p'), DATE_FORMAT(e.end_date, '%b %d %Y %h:%i %p'))) as event_data, 
+        $query = "SELECT p.event_id as event_id,
+          concat_ws(' ', e.title, concat_ws(' - ', DATE_FORMAT(e.start_date, '%b %d %Y %h:%i %p'), DATE_FORMAT(e.end_date, '%b %d %Y %h:%i %p'))) as event_data,
           count(p.id) as participant_count
-          FROM civicrm_participant p, civicrm_event e 
+          FROM civicrm_participant p, civicrm_event e
           WHERE p.event_id = e.id AND p.event_id IN ({$implodeRelatedEntities})
           GROUP BY p.event_id";
         $dao = CRM_Core_DAO::executeQuery($query);
@@ -233,23 +233,23 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
     }
     return $participantDetails;
   }
-  
+
   /**
    * This function gets all columns from civicrm_action_schedule on the basis of event id
-   * 
+   *
    * @param int $eventId Event ID
    * @param string $used_for Specifies for which entity type it's used for
-   * 
+   *
    * @access public
    * @static
-   * 
+   *
    * @return object
    */
   static public function getReminderDetailsByEventId($eventId, $used_for) {
     if ($eventId) {
       $query = "
         SELECT *
-        FROM   civicrm_action_schedule 
+        FROM   civicrm_action_schedule
         WHERE  entity_value = %1";
       if ($used_for) {
         $query .= " AND used_for = %2";
@@ -263,10 +263,10 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
     }
     return $dao;
   }
-  
+
    /**
    * Update mode column in civicrm_recurring_entity table for event related tabs
-   * 
+   *
    * @params int $entityId event id
    * @params string $linkedEntityTable Linked entity table name for this event
    * @return array
@@ -305,7 +305,7 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
           $result['entityId'] = $defaults['id'];
           $result['entityTable'] = $entityTable;
         }
-    } 
+    }
     return $result;
-  }  
+  }
 }
diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index 9b1d98dcca..c73fd1fe34 100644
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -1291,7 +1291,7 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
           $this->_params['role_id']
         );
       }
-      
+
       //CRM-15372 patch to fix fee amount replacing amount
       $this->_params['fee_amount'] =  $this->_params['amount'];
 
@@ -1368,13 +1368,13 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
 
         //build contribution params
         if (!$this->_onlinePendingContributionId) {
-          if (empty($params['source'])) { 
+          if (empty($params['source'])) {
             $contributionParams['source'] = ts('%1 : Offline registration (by %2)', array(1 => $eventTitle, 2 => $userName));
-          }                                                           
-          else {                                                     
-            $contributionParams['source'] = $params['source'];                                                             
-          }                                                          
-        } 
+          }
+          else {
+            $contributionParams['source'] = $params['source'];
+          }
+        }
 
         $contributionParams['currency'] = $config->defaultCurrency;
         $contributionParams['non_deductible_amount'] = 'null';
@@ -1405,8 +1405,8 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
           $contributionParams['is_pay_later'] = 1;
         }
         elseif ($contributionParams['contribution_status_id'] == CRM_Core_OptionGroup::getValue('contribution_status', 'Completed', 'name')) {
-	        $contributionParams['is_pay_later'] = 0;
-	      }
+          $contributionParams['is_pay_later'] = 0;
+        }
 
         if ($params['status_id'] == array_search('Partially paid', $participantStatus)) {
           if (!$amountOwed && $this->_action & CRM_Core_Action::UPDATE) {
@@ -1672,7 +1672,7 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
           $invoiceSettings = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,'contribution_invoice_settings');
           $invoicing = CRM_Utils_Array::value('invoicing', $invoiceSettings);
           $totalTaxAmount = 0;
-          
+
           //add dataArray in the receipts in ADD and UPDATE condition
           $dataArray = array();
           if ($this->_action & CRM_Core_Action::ADD) {
@@ -1738,8 +1738,8 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
         $prefixValue = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME, 'contribution_invoice_settings');
         $invoicing = CRM_Utils_Array::value('invoicing', $prefixValue);
         if (count($taxAmt) > 0 && (isset($invoicing) && isset($prefixValue['is_email_pdf']))) {
-          $sendTemplateParams['isEmailPdf'] = True; 
-          $sendTemplateParams['contributionId'] = $contributionId; 
+          $sendTemplateParams['isEmailPdf'] = True;
+          $sendTemplateParams['contributionId'] = $contributionId;
         }
         list($mailSent, $subject, $message, $html) = CRM_Core_BAO_MessageTemplate::sendTemplate($sendTemplateParams);
         if ($mailSent) {
diff --git a/CRM/Event/Form/Registration/ThankYou.php b/CRM/Event/Form/Registration/ThankYou.php
index 16486177a4..66e71e73c3 100644
--- a/CRM/Event/Form/Registration/ThankYou.php
+++ b/CRM/Event/Form/Registration/ThankYou.php
@@ -141,7 +141,7 @@ class CRM_Event_Form_Registration_ThankYou extends CRM_Event_Form_Registration {
       $this->assign('taxTerm', $taxTerm);
     }
     $this->assign('totalAmount', $this->_totalAmount);
-    
+
     $hookDiscount = $this->get('hookDiscount');
     if ($hookDiscount) {
       $this->assign('hookDiscount', $hookDiscount);
diff --git a/CRM/Financial/BAO/FinancialTypeAccount.php b/CRM/Financial/BAO/FinancialTypeAccount.php
index 3b18de1dad..5d3fe3a97c 100644
--- a/CRM/Financial/BAO/FinancialTypeAccount.php
+++ b/CRM/Financial/BAO/FinancialTypeAccount.php
@@ -244,8 +244,8 @@ WHERE cog.name = 'payment_instrument' ";
       array_search('Cost of Sales Account is', $accountRelationship) => array_search('Cost of Sales', $financialAccountTypeID),
       array_search('Income Account is', $accountRelationship) => array_search('Revenue', $financialAccountTypeID),
     );
-    
-    $dao =  CRM_Core_DAO::executeQuery('SELECT id, financial_account_type_id FROM civicrm_financial_account WHERE name LIKE %1', 
+
+    $dao =  CRM_Core_DAO::executeQuery('SELECT id, financial_account_type_id FROM civicrm_financial_account WHERE name LIKE %1',
       array(1 => array($financialType->name, 'String'))
     );
     $dao->fetch();
diff --git a/CRM/Financial/Form/FinancialAccount.php b/CRM/Financial/Form/FinancialAccount.php
index beb88f6470..938107994d 100644
--- a/CRM/Financial/Form/FinancialAccount.php
+++ b/CRM/Financial/Form/FinancialAccount.php
@@ -163,7 +163,7 @@ class CRM_Financial_Form_FinancialAccount extends CRM_Contribute_Form {
           'financial_account_id'  => $self->_id,
           'account_relationship'=> $relationshipId
         );
-        $result = CRM_Financial_BAO_FinancialTypeAccount::retrieve($params, $defaults);       
+        $result = CRM_Financial_BAO_FinancialTypeAccount::retrieve($params, $defaults);
         if ($result) {
           $errorMsg['is_tax'] = ts('Is Tax? must be set for this financial account');
         }
diff --git a/CRM/Financial/Form/FinancialType.php b/CRM/Financial/Form/FinancialType.php
index 7edafe387c..2259a7a6cd 100644
--- a/CRM/Financial/Form/FinancialType.php
+++ b/CRM/Financial/Form/FinancialType.php
@@ -71,7 +71,7 @@ class CRM_Financial_Form_FinancialType extends CRM_Contribute_Form {
     if ($this->_action == CRM_Core_Action::UPDATE && CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialType', $this->_id, 'is_reserved','vid')) {
       $this->freeze(array('is_active'));
     }
-    
+
     $this->addRule('name', ts('A financial type with this name already exists. Please select another name.'),'objectExists',
       array('CRM_Financial_DAO_FinancialType', $this->_id)
     );
diff --git a/CRM/Mailing/Form/Settings.php b/CRM/Mailing/Form/Settings.php
index b62f8bd176..6bb0250959 100644
--- a/CRM/Mailing/Form/Settings.php
+++ b/CRM/Mailing/Form/Settings.php
@@ -96,7 +96,7 @@ class CRM_Mailing_Form_Settings extends CRM_Core_Form {
       $dao->storeValues($dao, $defaults);
       $defaults['visibility'] = $dao->visibility;
     }
-    
+
     return $defaults;
   }
 
diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index f532df2826..80b8664643 100644
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -959,7 +959,7 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
             ));
             $tmp_statuses = $result['values'];
             $status_ids = array();
-      	    foreach($tmp_statuses as $cur_stat) {
+            foreach($tmp_statuses as $cur_stat) {
               $status_ids[] = $cur_stat['id'];
             }
             if (empty($params['status_id']) || in_array( $params['status_id'] , $status_ids) == false) {
@@ -1281,9 +1281,9 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
           $params['contribution_source'] = ts('%1 Membership: Offline signup (by %2)', array(1 => $membershipType, 2 => $userName));
         }
         else {
-          $params['contribution_source'] = $formValues['source'];	
+          $params['contribution_source'] = $formValues['source'];
         }
-      }	
+      }
 
       if (empty($params['is_override']) &&
         CRM_Utils_Array::value('contribution_status_id', $params) == array_search('Pending', CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name'))
@@ -1678,7 +1678,7 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
             } else {
               $dataArray[$value['tax_rate']] = CRM_Utils_Array::value('tax_amount', $value);
             }
-          } 
+          }
         }
         if ($taxAmount) {
           $this->assign('totalTaxAmount', $totalTaxAmount);
diff --git a/CRM/Member/Import/Parser/Membership.php b/CRM/Member/Import/Parser/Membership.php
index 09958ab631..7c3da7b96e 100644
--- a/CRM/Member/Import/Parser/Membership.php
+++ b/CRM/Member/Import/Parser/Membership.php
@@ -382,11 +382,11 @@ class CRM_Member_Import_Parser_Membership extends CRM_Member_Import_Parser {
               'membership' => $formatValues['membership_id'],
               'userId' => $session->get('userID'),
             );
-            
+
             if (empty($params['line_item']) && !empty($formatted['membership_type_id'])) {
               CRM_Price_BAO_LineItem::getLineItemArray($formatted, NULL, 'membership', $formatted['membership_type_id']);
             }
-            
+
             $newMembership = CRM_Member_BAO_Membership::create($formatted, $ids, TRUE);
             if (civicrm_error($newMembership)) {
               array_unshift($values, $newMembership['is_error'] . ' for Membership ID ' . $formatValues['membership_id'] . '. Row was skipped.');
diff --git a/CRM/PCP/BAO/PCP.php b/CRM/PCP/BAO/PCP.php
index 7066aa9055..9f876b4dd8 100644
--- a/CRM/PCP/BAO/PCP.php
+++ b/CRM/PCP/BAO/PCP.php
@@ -54,6 +54,7 @@ class CRM_PCP_BAO_PCP extends CRM_PCP_DAO_PCP {
    *
    * @param array $params reference array contains the values submitted by the form
    * @param bool $pcpBlock if true, create or update PCPBlock, else PCP
+   *
    * @access public
    * @static
    *
@@ -428,8 +429,8 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0";
    * Add PCP form elements to a form
    */
   /**
-   * @param $pcpId
-   * @param $page
+   * @param integer $pcpId
+   * @param CRM_Core_Page $page
    * @param null $elements
    */
   function buildPcp($pcpId, &$page, &$elements = NULL) {
diff --git a/CRM/Price/BAO/PriceSet.php b/CRM/Price/BAO/PriceSet.php
index 5c1b6ba8ac..4073be5213 100644
--- a/CRM/Price/BAO/PriceSet.php
+++ b/CRM/Price/BAO/PriceSet.php
@@ -39,7 +39,6 @@
  */
 class CRM_Price_BAO_PriceSet extends CRM_Price_DAO_PriceSet {
 
-  
   /**
    * static field for default price set details
    *
diff --git a/CRM/Report/xml/Menu/Report.xml b/CRM/Report/xml/Menu/Report.xml
index fe42f00389..e6f57492ef 100644
--- a/CRM/Report/xml/Menu/Report.xml
+++ b/CRM/Report/xml/Menu/Report.xml
@@ -74,5 +74,5 @@
      <path>civicrm/report/chart</path>
      <page_callback>CRM_Report_Form::uploadChartImage</page_callback>
      <access_arguments>access CiviReport</access_arguments>
-  </item> 
+  </item>
 </menu>
diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl
index 204506b218..fb3b957b4f 100644
--- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl
+++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl
@@ -130,8 +130,8 @@ registration process.{/ts}</p>
        {/if}
       {/foreach}
      {/if}
-	 
-     {if $event.is_public} 
+
+     {if $event.is_public}
       <tr>
        <td colspan="2" {$valueStyle}>
         {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
@@ -139,7 +139,7 @@ registration process.{/ts}</p>
        </td>
       </tr>
      {/if}
-	 
+
      {if $email}
       <tr>
        <th {$headerStyle}>
diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl
index ef278336bb..ba90e1f240 100644
--- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl
+++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl
@@ -83,7 +83,7 @@ registration process.{/ts}
 {ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}
 {/if}
 
-{if $event.is_public} 
+{if $event.is_public}
 {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
 {ts}Download iCalendar File:{/ts} {$icalFeed}
 {/if}
diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl
index 66953bcec6..da8a6ec05b 100644
--- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl
+++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl
@@ -158,8 +158,8 @@ registration process.{/ts}</p>
        {/if}
       {/foreach}
      {/if}
-	 
-     {if $event.is_public} 
+
+     {if $event.is_public}
       <tr>
        <td colspan="2" {$valueStyle}>
         {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
@@ -167,7 +167,7 @@ registration process.{/ts}</p>
        </td>
       </tr>
      {/if}
-	 
+
     {if $event.is_share}
         <tr>
             <td colspan="2" {$valueStyle}>
diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl
index 10847d8fe8..0694302ee8 100644
--- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl
+++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl
@@ -105,7 +105,7 @@ registration process.{/ts}
 {ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}
 {/if}
 
-{if $event.is_public} 
+{if $event.is_public}
 {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
 {ts}Download iCalendar File:{/ts} {$icalFeed}
 {/if}
diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl
index 87a921cbdc..b1a5aa349c 100644
--- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl
+++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl
@@ -137,7 +137,7 @@
       {/foreach}
      {/if}
 
-     {if $event.is_public} 
+     {if $event.is_public}
       <tr>
        <td colspan="2" {$valueStyle}>
         {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_text.tpl
index 6fc6205f9a..73d15a6f1b 100644
--- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_text.tpl
+++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_text.tpl
@@ -67,7 +67,7 @@ Click this link to go to a web page where you can confirm your registration onli
 {ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}
 {/if}
 
-{if $event.is_public} 
+{if $event.is_public}
 {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
 {ts}Download iCalendar File:{/ts} {$icalFeed}
 {/if}
diff --git a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl b/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl
index 4300512abe..bddc84c855 100644
--- a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl	
+++ b/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl	
@@ -5,10 +5,10 @@
 
   <style type="text/css">
     {literal}
-    /* Client-specific Styles */ 
+    /* Client-specific Styles */
     #outlook a {padding:0;} /* Force Outlook to provide a "view in browser" menu link. */
     body{width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0;}
-    
+
     /* Prevent Webkit and Windows Mobile platforms from changing default font sizes, while not breaking desktop design. */
     .ExternalClass {width:100%;} /* Force Hotmail to display emails at full width */
     .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;} /* Force Hotmail to display normal line spacing. */
@@ -39,12 +39,12 @@
     table[class="removeMobile"]{width:10px!important;}
     img[class="blog"] {width: 440px!important;height: auto!important;}
     }
-    
+
     /*IPHONE STYLES*/
     @media only screen and (max-width: 480px) {
     a[href^="tel"], a[href^="sms"] {text-decoration: none;color: #136388;pointer-events: none;cursor: default;}
     .mobile_link a[href^="tel"], .mobile_link a[href^="sms"] {text-decoration: none;color:#136388;pointer-events: auto;cursor: default;}
-    
+
     table[class=devicewidth] {width: 280px!important;text-align:center!important;}
     table[class=devicewidthmob] {width: 260px!important;text-align:center!important;}
     table[class=devicewidthinner] {width: 260px!important;text-align:center!important;}
@@ -57,14 +57,14 @@
     td[class="padding-top-right15"]{padding:15px 15px 0 0 !important;}
     td[class="padding-right15"]{padding-right:15px !important;}
     }
-    
+
     @media only screen and (max-device-width: 800px)
     {td[class="padding-top-right15"]{padding:15px 15px 0 0 !important;}
     td[class="padding-right15"]{padding-right:15px !important;}}
     @media only screen and (max-device-width: 769px) {
     .devicewidthmob {font-size:16px;}
     }
-    
+
     @media only screen and (max-width: 640px) {
     .desktop-spacer {display:none !important;}
  }
diff --git a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Two Column.tpl b/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Two Column.tpl
index 216ab36647..14c140fa13 100644
--- a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Two Column.tpl	
+++ b/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Two Column.tpl	
@@ -60,445 +60,445 @@
 
      @media only screen and (max-device-width: 800px)
      {td[class="padding-top-right15"]{padding:15px 15px 0 0 !important;}
-     td[class="padding-right15"]{padding-right:15px !important;}}		 
+     td[class="padding-right15"]{padding-right:15px !important;}}
      @media only screen and (max-device-width: 769px) {.devicewidthmob {font-size:14px;}}
 
-     @media only screen and (max-width: 640px) {.desktop-spacer {display:none !important;} 
-	   }
+     @media only screen and (max-width: 640px) {.desktop-spacer {display:none !important;}
+     }
      {/literal}
   </style>
   <body>
     <!-- Start of preheader --><!-- Start of preheader -->
     <table bgcolor="#0B4151" border="0" cellpadding="0" cellspacing="0" id="backgroundTable" width="100%">
-    	<tbody>
-    		<tr>
-    			<td>
-    			<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    				<tbody>
-    					<tr>
-    						<td width="100%">
-    						<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    							<tbody><!-- Spacing -->
-    								<tr>
-    									<td height="20" width="100%">&nbsp;</td>
-    								</tr>
-    								<!-- Spacing -->
-    								<tr>
-    									<td>
-    									<table align="left" border="0" cellpadding="0" cellspacing="0" class="devicewidthinner" width="360">
-    										<tbody>
-    											<tr>
-    												<td align="left" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; line-height:120%; color: #f8f8f8;padding-left:15px;" valign="middle">Organization or Program Name Here</td>
-    											</tr>
-    										</tbody>
-    									</table>
-
-    									<table align="right" border="0" cellpadding="0" cellspacing="0" class="emhide" width="320">
-    										<tbody>
-    											<tr>
-    												<td align="right" style="font-family: Helvetica, arial, sans-serif; font-size: 16px;color: #f8f8f8;padding-right:15px;" valign="middle">Month Year</td>
-    											</tr>
-    										</tbody>
-    									</table>
-    									</td>
-    								</tr>
-    								<!-- Spacing -->
-    								<tr>
-    									<td height="20" width="100%">&nbsp;</td>
-    								</tr>
-    								<!-- Spacing -->
-    							</tbody>
-    						</table>
-    						</td>
-    					</tr>
-    				</tbody>
-    			</table>
-    			</td>
-    		</tr>
-    	</tbody>
+      <tbody>
+        <tr>
+          <td>
+          <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+            <tbody>
+              <tr>
+                <td width="100%">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+                  <tbody><!-- Spacing -->
+                    <tr>
+                      <td height="20" width="100%">&nbsp;</td>
+                    </tr>
+                    <!-- Spacing -->
+                    <tr>
+                      <td>
+                      <table align="left" border="0" cellpadding="0" cellspacing="0" class="devicewidthinner" width="360">
+                        <tbody>
+                          <tr>
+                            <td align="left" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; line-height:120%; color: #f8f8f8;padding-left:15px;" valign="middle">Organization or Program Name Here</td>
+                          </tr>
+                        </tbody>
+                      </table>
+
+                      <table align="right" border="0" cellpadding="0" cellspacing="0" class="emhide" width="320">
+                        <tbody>
+                          <tr>
+                            <td align="right" style="font-family: Helvetica, arial, sans-serif; font-size: 16px;color: #f8f8f8;padding-right:15px;" valign="middle">Month Year</td>
+                          </tr>
+                        </tbody>
+                      </table>
+                      </td>
+                    </tr>
+                    <!-- Spacing -->
+                    <tr>
+                      <td height="20" width="100%">&nbsp;</td>
+                    </tr>
+                    <!-- Spacing -->
+                  </tbody>
+                </table>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          </td>
+        </tr>
+      </tbody>
     </table>
     <!-- End of preheader --><!-- start of logo -->
 
     <table bgcolor="#d8d8d8" border="0" cellpadding="0" cellspacing="0" id="backgroundTable" st-sortable="left-image" width="100%">
-    	<tbody>
-    		<tr>
-    			<td>
-    			<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidthmob" width="700">
-    				<tbody>
-    					<tr>
-    						<td width="100%">
-    						<table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    							<tbody><!-- Spacing -->
-    								<tr>
-    									<td height="20" width="100%">
-    									<table align="center" border="0" cellpadding="2" cellspacing="0" width="93%">
-    										<tbody>
-    											<tr>
+      <tbody>
+        <tr>
+          <td>
+          <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidthmob" width="700">
+            <tbody>
+              <tr>
+                <td width="100%">
+                <table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+                  <tbody><!-- Spacing -->
+                    <tr>
+                      <td height="20" width="100%">
+                      <table align="center" border="0" cellpadding="2" cellspacing="0" width="93%">
+                        <tbody>
+                          <tr>
                              <td rowspan="2" width="330"><a href="#"> <div class="imgpop"><img src="https://civicrm.org/sites/default/files/civicrm/custom/images/civicrm-logo-transparent.png" alt="Replace with your own logo" width="220" border="0" style="display:block;"/></div></a></td>
                             <td align="right" >
-    												<h6 class="collapse">&nbsp;</h6>
-    												</td>
-    											</tr>
-    											<tr>
-    												<td align="right">
-
-    												</td>
-    											</tr>
-    										</tbody>
-    									</table>
-    									</td>
-    								</tr>
-
-    							</tbody>
-    						</table>
-    						</td>
-    					</tr>
-    				</tbody>
-    			</table>
-    			</td>
-    		</tr>
-    	</tbody>
+                            <h6 class="collapse">&nbsp;</h6>
+                            </td>
+                          </tr>
+                          <tr>
+                            <td align="right">
+
+                            </td>
+                          </tr>
+                        </tbody>
+                      </table>
+                      </td>
+                    </tr>
+
+                  </tbody>
+                </table>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          </td>
+        </tr>
+      </tbody>
     </table>
     <!-- end of logo --> <!-- hero story 1 -->
 
     <table bgcolor="#d8d8d8" border="0" cellpadding="0" cellspacing="0" id="backgroundTable" st-sortable="left-image" width="101%">
-    	<tbody>
-    		<tr>
-    			<td>
-    			<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    				<tbody>
-    					<tr>
-    						<td width="100%">
-    						<table align="center" bgcolor="#f8f8f8" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    							<tbody>
-    								<tr>
-    									<td>
-    									<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    										<tbody>
-    											<tr>
-    												<td width="100%">
-    												<table align="center" bgcolor="#f8f8f8" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    													<tbody><!-- /Spacing -->
-    														<tr>
-    															<td style="font-family: Helvetica, arial, sans-serif; font-size: 24px; color:#f8f8f8; text-align:left; line-height: 26px; padding:5px 15px; background-color: #80C457">Hero Story Heading</td>
-    														</tr>
-    														<!-- Spacing -->
-    														<tr>
-    															<td>
-    															<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidthinner" width="700">
-    																<tbody><!-- image -->
-    																	<tr>
-    																		<td align="center" class="devicewidthinner" width="100%">
-    																		<div class="imgpop"><a href="#" target="_blank"><img alt="" border="0" class="blog" height="396" src="https://civicrm.org/sites/default/files/civicrm/custom/images/700x396.png" style="display:block; border:none; outline:none; text-decoration:none; padding:0; line-height:0;" width="700" /></a></div>
-    																		</td>
-    																	</tr>
-    																	<!-- /image --><!-- Spacing -->
-    																	<tr>
-    																		<td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
-    																	</tr>
-    																	<!-- /Spacing --><!-- hero story -->
-    																	<tr>
-    																		<td style="font-family: Helvetica, arial, sans-serif; font-size: 18px;  text-align:left; line-height: 26px; padding:0 15px;"><a href="#" style="color:#076187; text-decoration:none; " target="_blank">Subheading Here</a></td>
-    																	</tr>
-    																	<!-- Spacing -->
-    																	<tr>
-    																		<td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
-    																	</tr><!-- /Spacing -->
-    																	<tr>
-    																		<td style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 26px; padding:0 15px;"><span class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;">Replace with your text and images, and remember to link the facebook and twitter links in the footer to your pages. Have fun!</span></td>
-    																	</tr>
+      <tbody>
+        <tr>
+          <td>
+          <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+            <tbody>
+              <tr>
+                <td width="100%">
+                <table align="center" bgcolor="#f8f8f8" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+                  <tbody>
+                    <tr>
+                      <td>
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+                        <tbody>
+                          <tr>
+                            <td width="100%">
+                            <table align="center" bgcolor="#f8f8f8" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+                              <tbody><!-- /Spacing -->
+                                <tr>
+                                  <td style="font-family: Helvetica, arial, sans-serif; font-size: 24px; color:#f8f8f8; text-align:left; line-height: 26px; padding:5px 15px; background-color: #80C457">Hero Story Heading</td>
+                                </tr>
+                                <!-- Spacing -->
+                                <tr>
+                                  <td>
+                                  <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidthinner" width="700">
+                                    <tbody><!-- image -->
+                                      <tr>
+                                        <td align="center" class="devicewidthinner" width="100%">
+                                        <div class="imgpop"><a href="#" target="_blank"><img alt="" border="0" class="blog" height="396" src="https://civicrm.org/sites/default/files/civicrm/custom/images/700x396.png" style="display:block; border:none; outline:none; text-decoration:none; padding:0; line-height:0;" width="700" /></a></div>
+                                        </td>
+                                      </tr>
+                                      <!-- /image --><!-- Spacing -->
+                                      <tr>
+                                        <td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
+                                      </tr>
+                                      <!-- /Spacing --><!-- hero story -->
+                                      <tr>
+                                        <td style="font-family: Helvetica, arial, sans-serif; font-size: 18px;  text-align:left; line-height: 26px; padding:0 15px;"><a href="#" style="color:#076187; text-decoration:none; " target="_blank">Subheading Here</a></td>
+                                      </tr>
+                                      <!-- Spacing -->
+                                      <tr>
+                                        <td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
+                                      </tr><!-- /Spacing -->
+                                      <tr>
+                                        <td style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 26px; padding:0 15px;"><span class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;">Replace with your text and images, and remember to link the facebook and twitter links in the footer to your pages. Have fun!</span></td>
+                                      </tr>
 
     <!-- Spacing -->
-    																	<tr>
-    																		<td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
-    																	</tr><!-- /Spacing -->
+                                      <tr>
+                                        <td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
+                                      </tr><!-- /Spacing -->
 
               <!-- /Spacing --><!-- /hero story -->
 
-    																	<!-- Spacing -->                                                            <!-- Spacing -->
-
-
-
-    																	<!-- Spacing --><!-- end of content -->
-    																</tbody>
-    															</table>
-    															</td>
-    														</tr>
-    													</tbody>
-    												</table>
-    												</td>
-    											</tr>
-    										</tbody>
-    									</table>
-    									</td>
-    								</tr>
-    								<!-- Section Heading -->
-    								<tr>
-    									<td style="font-family: Helvetica, arial, sans-serif; font-size: 24px; color:#f8f8f8; text-align:left; line-height: 26px; padding:5px 15px; background-color: #80C457">Section Heading Here</td>
-    								</tr>
-    								<!-- /Section Heading -->
-    							</tbody>
-    						</table>
-    						</td>
-    					</tr>
-    				</tbody>
-    			</table>
-    			</td>
-    		</tr>
-    	</tbody>
+                                      <!-- Spacing -->                                                            <!-- Spacing -->
+
+
+
+                                      <!-- Spacing --><!-- end of content -->
+                                    </tbody>
+                                  </table>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            </td>
+                          </tr>
+                        </tbody>
+                      </table>
+                      </td>
+                    </tr>
+                    <!-- Section Heading -->
+                    <tr>
+                      <td style="font-family: Helvetica, arial, sans-serif; font-size: 24px; color:#f8f8f8; text-align:left; line-height: 26px; padding:5px 15px; background-color: #80C457">Section Heading Here</td>
+                    </tr>
+                    <!-- /Section Heading -->
+                  </tbody>
+                </table>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          </td>
+        </tr>
+      </tbody>
     </table>
     <!-- /hero story 1 --><!-- story one -->
 
     <table bgcolor="#d8d8d8" border="0" cellpadding="0" cellspacing="0" id="backgroundTable" st-sortable="left-image" width="100%">
-    	<tbody>
-    		<tr>
-    			<td>
-    			<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    				<tbody>
-    					<tr>
-    						<td width="100%">
-    						<table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    							<tbody><!-- Spacing -->
-    								<tr>
-    									<td class="desktop-spacer" height="20" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
-    								</tr>
-    								<!-- Spacing -->
-    								<tr>
-    									<td>
-    									<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="660">
-    										<tbody>
-    											<tr>
-    												<td><!-- Start of left column -->
-    												<table align="left" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="330">
-    													<tbody><!-- image -->
-    														<tr>
-    															<td align="center" class="devicewidth" height="150" valign="top" width="330"><a href="#"><img alt="" border="0" class="col2img" src="https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png" style="display:block; border:none; outline:none; text-decoration:none; display:block;" width="330" /></a></td>
-    														</tr>
-    														<!-- /image -->
-    													</tbody>
-    												</table>
-    												<!-- end of left column --><!-- spacing for mobile devices-->
-
-    												<table align="left" border="0" cellpadding="0" cellspacing="0" class="mobilespacing">
-    													<tbody>
-    														<tr>
-    															<td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
-    														</tr>
-    													</tbody>
-    												</table>
-    												<!-- end of for mobile devices--><!-- start of right column -->
-
-    												<table align="right" border="0" cellpadding="0" cellspacing="0" class="devicewidthmob" width="310">
-    													<tbody>
-    														<tr>
-    															<td class="padding-top-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 18px; text-align:left; line-height: 24px;"><a href="#" style="color:#076187; text-decoration:none; " target="_blank">Heading Here</a><a href="#" style="color:#076187; text-decoration:none;" target="_blank" title="CiviCRM helps keep the “City Beautiful” Movement”going strong"></a></td>
-    														</tr>
-    														<!-- end of title --><!-- Spacing -->
-    														<tr>
-    															<td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
-    														</tr>
-    														<!-- /Spacing --><!-- content -->
-    														<tr>
-    															<td class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;"><span class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      <tbody>
+        <tr>
+          <td>
+          <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+            <tbody>
+              <tr>
+                <td width="100%">
+                <table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+                  <tbody><!-- Spacing -->
+                    <tr>
+                      <td class="desktop-spacer" height="20" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
+                    </tr>
+                    <!-- Spacing -->
+                    <tr>
+                      <td>
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="660">
+                        <tbody>
+                          <tr>
+                            <td><!-- Start of left column -->
+                            <table align="left" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="330">
+                              <tbody><!-- image -->
+                                <tr>
+                                  <td align="center" class="devicewidth" height="150" valign="top" width="330"><a href="#"><img alt="" border="0" class="col2img" src="https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png" style="display:block; border:none; outline:none; text-decoration:none; display:block;" width="330" /></a></td>
+                                </tr>
+                                <!-- /image -->
+                              </tbody>
+                            </table>
+                            <!-- end of left column --><!-- spacing for mobile devices-->
+
+                            <table align="left" border="0" cellpadding="0" cellspacing="0" class="mobilespacing">
+                              <tbody>
+                                <tr>
+                                  <td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <!-- end of for mobile devices--><!-- start of right column -->
+
+                            <table align="right" border="0" cellpadding="0" cellspacing="0" class="devicewidthmob" width="310">
+                              <tbody>
+                                <tr>
+                                  <td class="padding-top-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 18px; text-align:left; line-height: 24px;"><a href="#" style="color:#076187; text-decoration:none; " target="_blank">Heading Here</a><a href="#" style="color:#076187; text-decoration:none;" target="_blank" title="CiviCRM helps keep the “City Beautiful” Movement”going strong"></a></td>
+                                </tr>
+                                <!-- end of title --><!-- Spacing -->
+                                <tr>
+                                  <td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
+                                </tr>
+                                <!-- /Spacing --><!-- content -->
+                                <tr>
+                                  <td class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;"><span class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
                                                                 tempor incididunt ut labore et dolore magna </span></td>
-    														</tr>
-    														<tr>
-    															<td class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;"><a href="#" style="color:#80C457;text-decoration:none;font-weight:bold;" target="_blank" title="CiviCRM helps keep the “City Beautiful” Movement”going strong">Read More</a></td>
-    														</tr>
-    														<!-- /button --><!-- end of content -->
-    													</tbody>
-    												</table>
-    												<!-- end of right column --></td>
-    											</tr>
-    										</tbody>
-    									</table>
-    									</td>
-    								</tr>
-    								<!-- Spacing -->
-    								<tr>
-    									<td height="20" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
-    								</tr>
-    							</tbody>
-    						</table>
-    						</td>
-    					</tr>
-    				</tbody>
-    			</table>
-    			</td>
-    		</tr>
-    	</tbody>
+                                </tr>
+                                <tr>
+                                  <td class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;"><a href="#" style="color:#80C457;text-decoration:none;font-weight:bold;" target="_blank" title="CiviCRM helps keep the “City Beautiful” Movement”going strong">Read More</a></td>
+                                </tr>
+                                <!-- /button --><!-- end of content -->
+                              </tbody>
+                            </table>
+                            <!-- end of right column --></td>
+                          </tr>
+                        </tbody>
+                      </table>
+                      </td>
+                    </tr>
+                    <!-- Spacing -->
+                    <tr>
+                      <td height="20" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
+                    </tr>
+                  </tbody>
+                </table>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          </td>
+        </tr>
+      </tbody>
     </table>
     <!-- /story one -->
     <!-- story two -->
 
     <table bgcolor="#d8d8d8" border="0" cellpadding="0" cellspacing="0" id="backgroundTable" st-sortable="left-image" width="100%">
-    	<tbody>
-    		<tr>
-    			<td>
-    			<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    				<tbody>
-    					<tr>
-    						<td width="100%">
-    						<table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    							<tbody><!-- Spacing -->
-    								<tr>
-    									<td bgcolor="#076187" height="0" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
-    								</tr>
-    								<!-- Spacing --><!-- Spacing -->
-    								<tr>
-    									<td class="desktop-spacer" height="20" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
-    								</tr>
-    								<!-- Spacing -->
-    								<tr>
-    									<td>
-    									<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="660">
-    										<tbody>
-    											<tr>
-    												<td><!-- Start of left column -->
-    												<table align="left" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="330">
-    													<tbody><!-- image -->
-    														<tr>
-    															<td align="center" class="devicewidth" height="150" valign="top" width="330"><a href="#"><img alt="" border="0" class="col2img" src="https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png" style="display:block; border:none; outline:none; text-decoration:none; display:block;" width="330" /></a></td>
-    														</tr>
-    														<!-- /image -->
-    													</tbody>
-    												</table>
-    												<!-- end of left column --><!-- spacing for mobile devices-->
-
-    												<table align="left" border="0" cellpadding="0" cellspacing="0" class="mobilespacing">
-    													<tbody>
-    														<tr>
-    															<td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
-    														</tr>
-    													</tbody>
-    												</table>
-    												<!-- end of for mobile devices--><!-- start of right column -->
-
-    												<table align="right" border="0" cellpadding="0" cellspacing="0" class="devicewidthmob" width="310">
-    													<tbody>
-    														<tr>
-    															<td class="padding-top-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 18px; text-align:left; line-height: 24px;"><a href="#" style="color:#076187; text-decoration:none; " target="_blank">Heading Here</a><a href="#" style="color:#076187; text-decoration:none;" target="_blank" title="How CiviCRM will take Tribodar Eco Learning Center to another level"></a></td>
-    														</tr>
-    														<!-- end of title --><!-- Spacing -->
-    														<tr>
-    															<td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
-    														</tr>
-    														<!-- /Spacing --><!-- content -->
-    														<tr>
-    															<td class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;"><span class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      <tbody>
+        <tr>
+          <td>
+          <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+            <tbody>
+              <tr>
+                <td width="100%">
+                <table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+                  <tbody><!-- Spacing -->
+                    <tr>
+                      <td bgcolor="#076187" height="0" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
+                    </tr>
+                    <!-- Spacing --><!-- Spacing -->
+                    <tr>
+                      <td class="desktop-spacer" height="20" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
+                    </tr>
+                    <!-- Spacing -->
+                    <tr>
+                      <td>
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="660">
+                        <tbody>
+                          <tr>
+                            <td><!-- Start of left column -->
+                            <table align="left" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="330">
+                              <tbody><!-- image -->
+                                <tr>
+                                  <td align="center" class="devicewidth" height="150" valign="top" width="330"><a href="#"><img alt="" border="0" class="col2img" src="https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png" style="display:block; border:none; outline:none; text-decoration:none; display:block;" width="330" /></a></td>
+                                </tr>
+                                <!-- /image -->
+                              </tbody>
+                            </table>
+                            <!-- end of left column --><!-- spacing for mobile devices-->
+
+                            <table align="left" border="0" cellpadding="0" cellspacing="0" class="mobilespacing">
+                              <tbody>
+                                <tr>
+                                  <td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <!-- end of for mobile devices--><!-- start of right column -->
+
+                            <table align="right" border="0" cellpadding="0" cellspacing="0" class="devicewidthmob" width="310">
+                              <tbody>
+                                <tr>
+                                  <td class="padding-top-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 18px; text-align:left; line-height: 24px;"><a href="#" style="color:#076187; text-decoration:none; " target="_blank">Heading Here</a><a href="#" style="color:#076187; text-decoration:none;" target="_blank" title="How CiviCRM will take Tribodar Eco Learning Center to another level"></a></td>
+                                </tr>
+                                <!-- end of title --><!-- Spacing -->
+                                <tr>
+                                  <td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
+                                </tr>
+                                <!-- /Spacing --><!-- content -->
+                                <tr>
+                                  <td class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;"><span class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
                                                                 tempor incididunt ut labore et dolore magna </span></td>
-    														</tr>
-    														<tr>
-    															<td class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;"><a href="#" style="color:#80C457;text-decoration:none;font-weight:bold;" target="_blank" title="How CiviCRM will take Tribodar Eco Learning Center to another level">Read More</a></td>
-    														</tr>
-    														<!-- /button --><!-- end of content -->
-    													</tbody>
-    												</table>
-    												<!-- end of right column --></td>
-    											</tr>
-    										</tbody>
-    									</table>
-    									</td>
-    								</tr>
-    								<!-- Spacing -->
-    								<tr>
-    									<td height="20" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
-    								</tr>
-    							</tbody>
-    						</table>
-    						</td>
-    					</tr>
-    				</tbody>
-    			</table>
-    			</td>
-    		</tr>
-    	</tbody>
+                                </tr>
+                                <tr>
+                                  <td class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;"><a href="#" style="color:#80C457;text-decoration:none;font-weight:bold;" target="_blank" title="How CiviCRM will take Tribodar Eco Learning Center to another level">Read More</a></td>
+                                </tr>
+                                <!-- /button --><!-- end of content -->
+                              </tbody>
+                            </table>
+                            <!-- end of right column --></td>
+                          </tr>
+                        </tbody>
+                      </table>
+                      </td>
+                    </tr>
+                    <!-- Spacing -->
+                    <tr>
+                      <td height="20" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
+                    </tr>
+                  </tbody>
+                </table>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          </td>
+        </tr>
+      </tbody>
     </table>
     <!-- /story two --><!-- story three -->
 
     <table bgcolor="#d8d8d8" border="0" cellpadding="0" cellspacing="0" id="backgroundTable" st-sortable="left-image" width="100%">
-    	<tbody>
-    		<tr>
-    			<td>
-    			<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    				<tbody>
-    					<tr>
-    						<td width="100%">
-    						<table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    							<tbody><!-- Spacing -->
-    								<tr>
-    									<td bgcolor="#076187" height="0" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
-    								</tr>
-    								<!-- Spacing --><!-- Spacing -->
-    								<tr>
-    									<td height="20" class="desktop-spacer" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
-    								</tr>
-    								<!-- Spacing -->
-    								<tr>
-    									<td>
-    									<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="660">
-    										<tbody>
-    											<tr>
-    												<td><!-- Start of left column -->
-    												<table align="left" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="330">
-    													<tbody><!-- image -->
-    														<tr>
-    															<td align="center" class="devicewidth" height="150" valign="top" width="330"><a href="#"><img alt="" border="0" class="col2img" src="https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png" style="display:block; border:none; outline:none; text-decoration:none; display:block;" width="330" /></a></td>
-    														</tr>
-    														<!-- /image -->
-    													</tbody>
-    												</table>
-    												<!-- end of left column --><!-- spacing for mobile devices-->
-
-    												<table align="left" border="0" cellpadding="0" cellspacing="0" class="mobilespacing">
-    													<tbody>
-    														<tr>
-    															<td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
-    														</tr>
-    													</tbody>
-    												</table>
-    												<!-- end of for mobile devices--><!-- start of right column -->
-
-    												<table align="right" border="0" cellpadding="0" cellspacing="0" class="devicewidthmob" width="310">
-    													<tbody>
-    														<tr>
-    															<td class="padding-top-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 18px;  text-align:left; line-height: 24px;"><a href="#" style="color:#076187; text-decoration:none; " target="_blank">Heading Here</a><a href="#" style="color:#076187; text-decoration:none;" target="_blank" title="CiviCRM provides a soup-to-nuts open-source solution for Friends of the San Pedro River"></a></td>
-    														</tr>
-    														<!-- end of title --><!-- Spacing -->
-    														<tr>
-    															<td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
-    														</tr>
-    														<!-- /Spacing --><!-- content -->
-    														<tr>
-    															<td class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;"><span class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      <tbody>
+        <tr>
+          <td>
+          <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+            <tbody>
+              <tr>
+                <td width="100%">
+                <table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+                  <tbody><!-- Spacing -->
+                    <tr>
+                      <td bgcolor="#076187" height="0" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
+                    </tr>
+                    <!-- Spacing --><!-- Spacing -->
+                    <tr>
+                      <td height="20" class="desktop-spacer" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
+                    </tr>
+                    <!-- Spacing -->
+                    <tr>
+                      <td>
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="660">
+                        <tbody>
+                          <tr>
+                            <td><!-- Start of left column -->
+                            <table align="left" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="330">
+                              <tbody><!-- image -->
+                                <tr>
+                                  <td align="center" class="devicewidth" height="150" valign="top" width="330"><a href="#"><img alt="" border="0" class="col2img" src="https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png" style="display:block; border:none; outline:none; text-decoration:none; display:block;" width="330" /></a></td>
+                                </tr>
+                                <!-- /image -->
+                              </tbody>
+                            </table>
+                            <!-- end of left column --><!-- spacing for mobile devices-->
+
+                            <table align="left" border="0" cellpadding="0" cellspacing="0" class="mobilespacing">
+                              <tbody>
+                                <tr>
+                                  <td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <!-- end of for mobile devices--><!-- start of right column -->
+
+                            <table align="right" border="0" cellpadding="0" cellspacing="0" class="devicewidthmob" width="310">
+                              <tbody>
+                                <tr>
+                                  <td class="padding-top-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 18px;  text-align:left; line-height: 24px;"><a href="#" style="color:#076187; text-decoration:none; " target="_blank">Heading Here</a><a href="#" style="color:#076187; text-decoration:none;" target="_blank" title="CiviCRM provides a soup-to-nuts open-source solution for Friends of the San Pedro River"></a></td>
+                                </tr>
+                                <!-- end of title --><!-- Spacing -->
+                                <tr>
+                                  <td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
+                                </tr>
+                                <!-- /Spacing --><!-- content -->
+                                <tr>
+                                  <td class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;"><span class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
                                                                 tempor incididunt ut labore et dolore magna </span></td>
-    														</tr>
-    														<tr>
-    															<td style="font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;"><a href="#" style="color:#80C457;text-decoration:none;font-weight:bold;" target="_blank" title="CiviCRM provides a soup-to-nuts open-source solution for Friends of the San Pedro River">Read More</a></td>
-    														</tr>
-    														<!-- /button --><!-- end of content -->
-    													</tbody>
-    												</table>
-    												<!-- end of right column --></td>
-    											</tr>
-    										</tbody>
-    									</table>
-    									</td>
-    								</tr>
-    								<!-- Spacing -->
-    								<tr>
-    									<td height="20" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
-    								</tr>
-    								<!-- Spacing -->
-    							</tbody>
-    						</table>
-    						</td>
-    					</tr>
-    				</tbody>
-    			</table>
-    			</td>
-    		</tr>
-    	</tbody>
+                                </tr>
+                                <tr>
+                                  <td style="font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;"><a href="#" style="color:#80C457;text-decoration:none;font-weight:bold;" target="_blank" title="CiviCRM provides a soup-to-nuts open-source solution for Friends of the San Pedro River">Read More</a></td>
+                                </tr>
+                                <!-- /button --><!-- end of content -->
+                              </tbody>
+                            </table>
+                            <!-- end of right column --></td>
+                          </tr>
+                        </tbody>
+                      </table>
+                      </td>
+                    </tr>
+                    <!-- Spacing -->
+                    <tr>
+                      <td height="20" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
+                    </tr>
+                    <!-- Spacing -->
+                  </tbody>
+                </table>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          </td>
+        </tr>
+      </tbody>
     </table>
     <!-- /story three -->
 
@@ -508,78 +508,78 @@
 
     <!-- story four -->
     <table bgcolor="#d8d8d8" border="0" cellpadding="0" cellspacing="0" id="backgroundTable" st-sortable="left-image" width="100%">
-    	<tbody>
-    		<tr>
-    			<td>
-    			<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    				<tbody>
-    					<tr>
-    						<td width="100%">
-    						<table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    							<tbody>
+      <tbody>
+        <tr>
+          <td>
+          <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+            <tbody>
+              <tr>
+                <td width="100%">
+                <table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+                  <tbody>
                                 <!-- Spacing -->
-    								<tr>
-    									<td bgcolor="#076187" height="0" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
-    								</tr>
-    								<!-- Spacing -->
+                    <tr>
+                      <td bgcolor="#076187" height="0" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
+                    </tr>
+                    <!-- Spacing -->
                                 <!-- Spacing -->
-    								<tr>
-    									<td class="desktop-spacer" height="20" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
-    								</tr>
-    								<!-- Spacing -->
-    								<tr>
-    									<td>
-    									<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="660">
-    										<tbody>
-    											<tr>
-    												<td><!-- Start of left column -->
-    												<table align="left" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="330">
-    													<tbody><!-- image -->
-    														<tr>
-    															<td align="center" class="devicewidth" height="150" valign="top" width="330"><a href="#"><img alt="" border="0" class="col2img" src="https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png" style="display:block; border:none; outline:none; text-decoration:none; display:block;" width="330" /></a></td>
-    														</tr>
-    														<!-- /image -->
-    													</tbody>
-    												</table>
-    												<!-- end of left column --><!-- spacing for mobile devices-->
-
-    												<table align="left" border="0" cellpadding="0" cellspacing="0" class="mobilespacing">
-    													<tbody>
-    														<tr>
-    															<td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
-    														</tr>
-    													</tbody>
-    												</table>
-    												<!-- end of for mobile devices--><!-- start of right column -->
-
-    												<table align="right" border="0" cellpadding="0" cellspacing="0" class="devicewidthmob" width="310">
-    													<tbody>
-    														<tr>
-    															<td class="padding-top-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 18px;text-align:left; line-height: 24px;"><a href="#" style="color:#076187; text-decoration:none; " target="_blank">Heading Here</a><a href="#" style="color:#076187; text-decoration:none;" target="_blank" title="Google Summer of Code"></a></td>
-    														</tr>
-    														<!-- end of title --><!-- Spacing -->
-    														<tr>
-    															<td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
-    														</tr>
-    														<!-- /Spacing --><!-- content -->
-    														<tr>
-    															<td class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;"><span class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+                    <tr>
+                      <td class="desktop-spacer" height="20" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
+                    </tr>
+                    <!-- Spacing -->
+                    <tr>
+                      <td>
+                      <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="660">
+                        <tbody>
+                          <tr>
+                            <td><!-- Start of left column -->
+                            <table align="left" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="330">
+                              <tbody><!-- image -->
+                                <tr>
+                                  <td align="center" class="devicewidth" height="150" valign="top" width="330"><a href="#"><img alt="" border="0" class="col2img" src="https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png" style="display:block; border:none; outline:none; text-decoration:none; display:block;" width="330" /></a></td>
+                                </tr>
+                                <!-- /image -->
+                              </tbody>
+                            </table>
+                            <!-- end of left column --><!-- spacing for mobile devices-->
+
+                            <table align="left" border="0" cellpadding="0" cellspacing="0" class="mobilespacing">
+                              <tbody>
+                                <tr>
+                                  <td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <!-- end of for mobile devices--><!-- start of right column -->
+
+                            <table align="right" border="0" cellpadding="0" cellspacing="0" class="devicewidthmob" width="310">
+                              <tbody>
+                                <tr>
+                                  <td class="padding-top-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 18px;text-align:left; line-height: 24px;"><a href="#" style="color:#076187; text-decoration:none; " target="_blank">Heading Here</a><a href="#" style="color:#076187; text-decoration:none;" target="_blank" title="Google Summer of Code"></a></td>
+                                </tr>
+                                <!-- end of title --><!-- Spacing -->
+                                <tr>
+                                  <td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
+                                </tr>
+                                <!-- /Spacing --><!-- content -->
+                                <tr>
+                                  <td class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;"><span class="padding-right15" style="font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
                                                                 tempor incididunt ut labore et dolore magna </span></td>
-    														</tr>
-    														<tr>
-    															<td style="font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;"><a href="#" style="color:#80C457;text-decoration:none;font-weight:bold;" target="_blank" title="Google Summer of Code">Read More</a></td>
-    														</tr>
-    														<!-- /button --><!-- end of content -->
-    													</tbody>
-    												</table>
-    												<!-- end of right column --></td>
-    											</tr>
-    										</tbody>
-    									</table>
-    									</td>
-    								</tr>
-    								<!-- Spacing -->
-    								<tr>
+                                </tr>
+                                <tr>
+                                  <td style="font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;"><a href="#" style="color:#80C457;text-decoration:none;font-weight:bold;" target="_blank" title="Google Summer of Code">Read More</a></td>
+                                </tr>
+                                <!-- /button --><!-- end of content -->
+                              </tbody>
+                            </table>
+                            <!-- end of right column --></td>
+                          </tr>
+                        </tbody>
+                      </table>
+                      </td>
+                    </tr>
+                    <!-- Spacing -->
+                    <tr>
                        <td height="15" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;" width="100%">&nbsp;</td>
                     </tr>
                     <!-- /Spacing -->
@@ -587,17 +587,17 @@
                       <td style="padding: 15px;">
                       <p style="font-family: Helvetica, arial, sans-serif; font-size: 16px; color:#076187; text-align:left; line-height: 26px; padding-bottom:10px;">Remember to link the facebook and twitter links below to your pages!</p>
                       </td>
-    								</tr>
-    								<!-- Spacing -->
-    							</tbody>
-    						</table>
-    						</td>
-    					</tr>
-    				</tbody>
-    			</table>
-    			</td>
-    		</tr>
-    	</tbody>
+                    </tr>
+                    <!-- Spacing -->
+                  </tbody>
+                </table>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          </td>
+        </tr>
+      </tbody>
     </table>
     <!-- /story four -->
 
@@ -605,67 +605,67 @@
 
     <!-- End of footer --><!-- Start of postfooter -->
     <table bgcolor="#d8d8d8" border="0" cellpadding="0" cellspacing="0" id="backgroundTable" st-sortable="footer" width="100%">
-    	<tbody>
-    		<tr>
-    			<td>
-    			<table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
+      <tbody>
+        <tr>
+          <td>
+          <table align="center" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
             <tbody>
               <tr>
                 <td width="100%">
                   <table align="center" bgcolor="#89c66b" border="0" cellpadding="0" cellspacing="0" class="devicewidth" width="700">
-    				        <tbody><!-- Spacing -->
-    					        <tr>
+                    <tbody><!-- Spacing -->
+                      <tr>
                         <td height="10" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
-    					        </tr>
-    					        <!-- Spacing -->
-    					        <tr>
+                      </tr>
+                      <!-- Spacing -->
+                      <tr>
                         <td><!-- logo -->
                         <table align="left" border="0" cellpadding="0" cellspacing="0" width="250">
-            							<tbody>
-            								<tr>
+                          <tbody>
+                            <tr>
                                <td width="20">&nbsp;</td>
                               <td align="left" height="40" width="250"><span style="font-family: Helvetica, arial, sans-serif; font-size: 13px; text-align:left; line-height: 26px; padding-bottom:10px;"><a href="{action.unsubscribeUrl}" style="color: #f0f0f0;">Unsubscribe | </a><a href="{action.subscribeUrl}" style="color: #f0f0f0;">Subscribe |</a> <a href="{action.optOutUrl}" style="color: #f0f0f0;">Opt out</a></span></td>
                             </tr>
-      											<tr>
-      												<td width="20">&nbsp;</td>
-      												<td align="left" height="40" width="250"><span style="font-family: Helvetica, arial, sans-serif; font-size: 13px; text-align:left; line-height: 26px; padding-bottom:10px; color: #f0f0f0;">{domain.address}</span></td>
-      											</tr>
+                            <tr>
+                              <td width="20">&nbsp;</td>
+                              <td align="left" height="40" width="250"><span style="font-family: Helvetica, arial, sans-serif; font-size: 13px; text-align:left; line-height: 26px; padding-bottom:10px; color: #f0f0f0;">{domain.address}</span></td>
+                            </tr>
                           </tbody>
                         </table>
                         <!-- end of logo --><!-- start of social icons -->
-      									<table align="right" border="0" cellpadding="0" cellspacing="0" height="40" vaalign="middle" width="60">
-      										<tbody>
-      											<tr>
-      												<td align="left" height="22" width="22">
-                                <div class="imgpop"><a href="#" target="_blank"><img alt="" border="0" height="22" src="https://civicrm.org/sites/default/files/civicrm/custom/images/facebook.png" style="display:block; border:none; outline:none; text-decoration:none;" width="22" /> </a></div>      											  </td>
-      												<td align="left" style="font-size:1px; line-height:1px;" width="10">&nbsp;</td>
-      												<td align="right" height="22" width="22">
-      												<div class="imgpop"><a href="#" target="_blank"><img alt="" border="0" height="22" src="https://civicrm.org/sites/default/files/civicrm/custom/images/twitter.png" style="display:block; border:none; outline:none; text-decoration:none;" width="22" /> </a></div>
-      												</td>
-      												<td align="left" style="font-size:1px; line-height:1px;" width="20">&nbsp;</td>
-      											</tr>
-      										</tbody>
-      									</table>
-    									<!-- end of social icons --></td>
-    								</tr>
-    								<!-- Spacing -->
-    								<tr>
-    									<td height="10" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
-    								</tr>
-    								<!-- Spacing -->
-    								<tr>
-    									<td bgcolor="#80C457" height="10" width="100%">&nbsp;</td>
-    								</tr>
-    								<!-- Spacing -->
-    							</tbody>
-    						</table>
-    						</td>
-    					</tr>
-    				</tbody>
-    			</table>
-    			</td>
-    		</tr>
-    	</tbody>
+                        <table align="right" border="0" cellpadding="0" cellspacing="0" height="40" vaalign="middle" width="60">
+                          <tbody>
+                            <tr>
+                              <td align="left" height="22" width="22">
+                                <div class="imgpop"><a href="#" target="_blank"><img alt="" border="0" height="22" src="https://civicrm.org/sites/default/files/civicrm/custom/images/facebook.png" style="display:block; border:none; outline:none; text-decoration:none;" width="22" /> </a></div>                              </td>
+                              <td align="left" style="font-size:1px; line-height:1px;" width="10">&nbsp;</td>
+                              <td align="right" height="22" width="22">
+                              <div class="imgpop"><a href="#" target="_blank"><img alt="" border="0" height="22" src="https://civicrm.org/sites/default/files/civicrm/custom/images/twitter.png" style="display:block; border:none; outline:none; text-decoration:none;" width="22" /> </a></div>
+                              </td>
+                              <td align="left" style="font-size:1px; line-height:1px;" width="20">&nbsp;</td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      <!-- end of social icons --></td>
+                    </tr>
+                    <!-- Spacing -->
+                    <tr>
+                      <td height="10" style="font-size:1px; line-height:1px; mso-line-height-rule: exactly;">&nbsp;</td>
+                    </tr>
+                    <!-- Spacing -->
+                    <tr>
+                      <td bgcolor="#80C457" height="10" width="100%">&nbsp;</td>
+                    </tr>
+                    <!-- Spacing -->
+                  </tbody>
+                </table>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          </td>
+        </tr>
+      </tbody>
     </table>
     <!-- End of footer -->
   </body>
diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl
index 910430fbe8..bb5cf90338 100644
--- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl
+++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl
@@ -12,12 +12,12 @@
     </table>
     <center>
       <table style = "padding-right:19px;font-family: Arial, Verdana, sans-serif;" width = "500" height = "100" border = "0" cellpadding = "2" cellspacing = "1">
-	<tr>
-	  <td style = "padding-left:15px;" ><b><font size = "4" align = "center">TAX INVOICE</font></b></td>
+  <tr>
+    <td style = "padding-left:15px;" ><b><font size = "4" align = "center">TAX INVOICE</font></b></td>
           <td colspan = "1"></td>
-          <td style = "padding-left:70px;"><b><font size = "1" align = "center" >Invoice Date:</font></b></td>         
+          <td style = "padding-left:70px;"><b><font size = "1" align = "center" >Invoice Date:</font></b></td>
           <td><font size = "1" align = "right">{$domain_organization}</font></td>
-	</tr>
+  </tr>
         <tr>
          {if $organization_name}
            <td style = "padding-left:17px;"><font size = "1" align = "center" >{$display_name}  ({$organization_name})</font></td>
@@ -26,56 +26,56 @@
          {/if}
          <td colspan = "1"></td>
          <td style = "padding-left:70px;"><font size = "1" align = "right">{$invoice_date}</font></td>
-	 <td><font size = "1" align = "right"> 
-	{if $domain_street_address } 
-	  {$domain_street_address}
-	{/if}
-	{if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}</font></td>    
-	</tr>
+   <td><font size = "1" align = "right">
+  {if $domain_street_address }
+    {$domain_street_address}
+  {/if}
+  {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}</font></td>
+  </tr>
         <tr>
           <td style = "padding-left:17px;"><font size = "1" align = "center">{$street_address}   {$supplemental_address_1}</font></td>
           <td colspan = "1"></td>
-          <td style = "padding-left:70px;"><b><font size = "1" align = "right">Incoice Number:</font></b></td> 
-	  <td ><font size = "1" align = "right">{if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}
-	  {if $domain_state }{$domain_state}{/if}</font></td> 
+          <td style = "padding-left:70px;"><b><font size = "1" align = "right">Incoice Number:</font></b></td>
+    <td ><font size = "1" align = "right">{if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}
+    {if $domain_state }{$domain_state}{/if}</font></td>
         </tr>
         <tr>
           <td style = "padding-left:17px;"><font size = "1" align = "center">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>
           <td colspan="1"></td>
           <td style = "padding-left:70px;"><font size = "1" align = "right">{$invoice_id}</font></td>
-	  <td><font size = "1" align = "right">{if $domain_city}
-		{$domain_city}
-	      {/if}
-	      {if $domain_postal_code }
-		{$domain_postal_code}
-	      {/if}	
-	  </font></td> 
-	</tr>
-	<tr>
-          <td style = "padding-left:17px;"><font size = "1" align = "right">{$city}  {$postal_code}</font></td>    
+    <td><font size = "1" align = "right">{if $domain_city}
+    {$domain_city}
+        {/if}
+        {if $domain_postal_code }
+    {$domain_postal_code}
+        {/if}
+    </font></td>
+  </tr>
+  <tr>
+          <td style = "padding-left:17px;"><font size = "1" align = "right">{$city}  {$postal_code}</font></td>
           <td colspan="1"></td>
-	  <td height = "10" style = "padding-left:70px;"><b><font size = "1"align = "right">Reference:</font></b></td>
-	  <td><font size = "1" align = "right"> {if $domain_country} 
-		{$domain_country}
-	      {/if}</font></td>
-	</tr>
-	<tr>
-	  <td></td>
-	  <td></td>
-	  <td style = "padding-left:70px;"><font size = "1"align = "right">{$source}</font></td> 
-	  <td><font size = "1" align = "right"> {if $domain_phone}{$domain_phone}{/if}</font> </td> 
-	</tr>
-	<tr>
-	  <td></td>
-	  <td></td>
-	  <td></td> 
-	  <td><font size = "1" align = "right"> {if $domain_email}
-		{$domain_email}
-	       {/if}</font> </td> 
-	</tr>
+    <td height = "10" style = "padding-left:70px;"><b><font size = "1"align = "right">Reference:</font></b></td>
+    <td><font size = "1" align = "right"> {if $domain_country}
+    {$domain_country}
+        {/if}</font></td>
+  </tr>
+  <tr>
+    <td></td>
+    <td></td>
+    <td style = "padding-left:70px;"><font size = "1"align = "right">{$source}</font></td>
+    <td><font size = "1" align = "right"> {if $domain_phone}{$domain_phone}{/if}</font> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td><font size = "1" align = "right"> {if $domain_email}
+    {$domain_email}
+         {/if}</font> </td>
+  </tr>
       </table>
-      <table style = "margin-top:75px;font-family: Arial, Verdana, sans-serif" width = "590" border = "0"cellpadding = "-5" cellspacing = "19" id = "desc">	
-	<tr>
+      <table style = "margin-top:75px;font-family: Arial, Verdana, sans-serif" width = "590" border = "0"cellpadding = "-5" cellspacing = "19" id = "desc">
+  <tr>
           <td colspan = "2" {$valueStyle}>
             <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}
               <tr>
@@ -86,84 +86,84 @@
                 <th style = "padding-left:34px;text-align:right;font-weight:bold;"><font size = "1">Amount {$defaultCurrency}</font></th>
               </tr>
               {foreach from=$lineItem item=value key=priceset name=taxpricevalue}
-		{if $smarty.foreach.taxpricevalue.index eq 0}
-	          <tr><td  colspan = "5" ><hr size="3" style = "color:#000;"></hr></td></tr>
-		{else}
-		  <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
-		{/if}
+    {if $smarty.foreach.taxpricevalue.index eq 0}
+            <tr><td  colspan = "5" ><hr size="3" style = "color:#000;"></hr></td></tr>
+    {else}
+      <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
+    {/if}
                 <tr>
                   <td style="text-align:left;" ><font size = "1">
-		  {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}<div>{$value.description|truncate:30:"..."}</div>{/if}
-		  </font></td>
-		  <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$value.qty}</font></td>
-		  <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$value.unit_price|crmMoney:$currency}</font></td>
-		    {if $value.tax_amount != ''}
-		      <td style = "padding-left:34px;text-align:right;width:20px;"><font size = "1"> {$value.tax_rate}%</font></td>
+      {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}<div>{$value.description|truncate:30:"..."}</div>{/if}
+      </font></td>
+      <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$value.qty}</font></td>
+      <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$value.unit_price|crmMoney:$currency}</font></td>
+        {if $value.tax_amount != ''}
+          <td style = "padding-left:34px;text-align:right;width:20px;"><font size = "1"> {$value.tax_rate}%</font></td>
                     {else}
-		      <td style = "padding-left:34px;text-align:right;width:20px;"><font size = "1">No {$taxTerm}</font></td>
-	            {/if}
-		    <td style = "padding-left:34px;text-align:right;"><font size = "1">{$value.subTotal|crmMoney:$currency}</font></td>
-		</tr>
+          <td style = "padding-left:34px;text-align:right;width:20px;"><font size = "1">No {$taxTerm}</font></td>
+              {/if}
+        <td style = "padding-left:34px;text-align:right;"><font size = "1">{$value.subTotal|crmMoney:$currency}</font></td>
+    </tr>
               {/foreach}
-	        <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
-	        <tr>
-		  <td colspan = "3"></td>
-		  <td style = "padding-left:20px;text-align:right;"><font size = "1">Sub Total</font></td>
-		  <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$subTotal|crmMoney:$currency}</font></td>
-		</tr>
-		{foreach from = $dataArray item = value key = priceset}
-	          <tr>
-		    <td colspan = "3"></td>
-		    {if $priceset}
-		      <td style = "padding-left:20px;text-align:right;"><font size = "1"> TOTAL {$taxTerm} {$priceset}%</font></td>    
-		      <td style = "padding-left:34px;text-align:right"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
+          <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
+          <tr>
+      <td colspan = "3"></td>
+      <td style = "padding-left:20px;text-align:right;"><font size = "1">Sub Total</font></td>
+      <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$subTotal|crmMoney:$currency}</font></td>
+    </tr>
+    {foreach from = $dataArray item = value key = priceset}
+            <tr>
+        <td colspan = "3"></td>
+        {if $priceset}
+          <td style = "padding-left:20px;text-align:right;"><font size = "1"> TOTAL {$taxTerm} {$priceset}%</font></td>
+          <td style = "padding-left:34px;text-align:right"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
                     {elseif $priceset == 0}
                       <td style = "padding-left:20px;text-align:right;"><font size = "1">TOTAL NO {$taxTerm}</font></td>
                       <td style = "padding-left:34px;text-align:right"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
                   </tr>
-		    {/if}
-		{/foreach}
-	        <tr>
-		  <td colspan = "3"></td>
-		  <td colspan = "2"><hr></hr></td>
-		</tr>
+        {/if}
+    {/foreach}
+          <tr>
+      <td colspan = "3"></td>
+      <td colspan = "2"><hr></hr></td>
+    </tr>
 
-	        <tr>
-		  <td colspan = "3"></td>
-		  <td style = "padding-left:20px;text-align:right;"><b><font size = "1">TOTAL {$defaultCurrency}</font></b></td>
-		  <td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>     
-		</tr>
+          <tr>
+      <td colspan = "3"></td>
+      <td style = "padding-left:20px;text-align:right;"><b><font size = "1">TOTAL {$defaultCurrency}</font></b></td>
+      <td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
+    </tr>
 
-		{if $is_pay_later == 0}
-	          <tr>
-		    <td colspan = "3"></td>		   
-		    <td style = "padding-left:20px;text-align:right;"><font size = "1">
-		       {if $contribution_status_id == $refundedStatusId}
-			    LESS Amount Credited
-		       {else}
-			    LESS Amount Paid
-		       {/if}
-		    </font></td>
-		    <td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
-		  </tr>
-	          <tr>
-		    <td colspan = "3"></td>
-		    <td colspan = "2" ><hr></hr></td>
-		  </tr>
-	          <tr>
-		    <td colspan = "3"></td>
-		    <td style = "padding-left:20px;text-align:right;"><b><font size = "1">AMOUNT DUE: </font></b></td> 
+    {if $is_pay_later == 0}
+            <tr>
+        <td colspan = "3"></td>
+        <td style = "padding-left:20px;text-align:right;"><font size = "1">
+           {if $contribution_status_id == $refundedStatusId}
+          LESS Amount Credited
+           {else}
+          LESS Amount Paid
+           {/if}
+        </font></td>
+        <td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
+      </tr>
+            <tr>
+        <td colspan = "3"></td>
+        <td colspan = "2" ><hr></hr></td>
+      </tr>
+            <tr>
+        <td colspan = "3"></td>
+        <td style = "padding-left:20px;text-align:right;"><b><font size = "1">AMOUNT DUE: </font></b></td>
                     <td style = "padding-left:34px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>                 <td style = "padding-left:34px;"><font size = "1" align = "right"></fonts></td>
-		  </tr>
-		{/if}
-		<br/><br/><br/>
-	        <tr>
-		  <td colspan = "3"></td>
-		</tr>
-	        <tr>		 
-		  <td><b><font size = "1" align = "center">DUE DATE: {$dueDate}</font></b></td>                 
-		  <td colspan = "3"></td>
-		</tr>
+      </tr>
+    {/if}
+    <br/><br/><br/>
+          <tr>
+      <td colspan = "3"></td>
+    </tr>
+          <tr>
+      <td><b><font size = "1" align = "center">DUE DATE: {$dueDate}</font></b></td>
+      <td colspan = "3"></td>
+    </tr>
             </table>
           </td>
         </tr>
@@ -173,58 +173,58 @@
           <td><img src = "{$resourceBase}/i/contribute/cut_line.png" height = "15" width = "630"></td>
         </tr>
       </table>
-	<table style = "margin-top:6px;padding-right:20px;font-family: Arial, Verdana, sans-serif" width = "480" border = "0"cellpadding = "-5" cellspacing="19" id = "desc">
-	  <tr>
-	    <td width="60%"><b><font size = "4" align = "right">PAYMENT ADVICE</font></b> <br/><br/> <font size = "1" align = "right"><b>To: </b>      <div style="width:17em;word-wrap:break-word;">     
-		{$domain_organization} <br />
-		{$domain_street_address} {$domain_supplemental_address_1} <br />
-		{$domain_supplemental_address_2} {$domain_state} <br />
-		{$domain_city} {$domain_postal_code} <br />
-		{$domain_country} <br />
-		{$domain_phone} <br />
-		{$domain_email}</div>
-		</font><br/><br/><font size="1" align="right">{$notes}</font>
+  <table style = "margin-top:6px;padding-right:20px;font-family: Arial, Verdana, sans-serif" width = "480" border = "0"cellpadding = "-5" cellspacing="19" id = "desc">
+    <tr>
+      <td width="60%"><b><font size = "4" align = "right">PAYMENT ADVICE</font></b> <br/><br/> <font size = "1" align = "right"><b>To: </b>      <div style="width:17em;word-wrap:break-word;">
+    {$domain_organization} <br />
+    {$domain_street_address} {$domain_supplemental_address_1} <br />
+    {$domain_supplemental_address_2} {$domain_state} <br />
+    {$domain_city} {$domain_postal_code} <br />
+    {$domain_country} <br />
+    {$domain_phone} <br />
+    {$domain_email}</div>
+    </font><br/><br/><font size="1" align="right">{$notes}</font>
             </td>
             <td width="40%">
-	      <table  cellpadding = "-10" cellspacing = "22"  align="right" >
-		<tr>
-	          <td  colspan = "2"></td>
-		  <td><font size = "1" align = "right" style="font-weight:bold;">Customer: </font></td>
-		  <td ><font size = "1" align = "right">{$display_name}</font></td>   
-		</tr>
-		<tr>
-		  <td colspan = "2"></td>
-		  <td><font size = "1" align = "right" style="font-weight:bold;">Invoice Number: </font></td>
-		  <td><font size = "1" align = "right">{$invoice_id}</font></td>   
-		</tr>
-		<tr><td  colspan = "5"style = "color:#F5F5F5;"><hr></hr></td></tr>
-		{if $is_pay_later == 1}       
-		<tr>
+        <table  cellpadding = "-10" cellspacing = "22"  align="right" >
+    <tr>
+            <td  colspan = "2"></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">Customer: </font></td>
+      <td ><font size = "1" align = "right">{$display_name}</font></td>
+    </tr>
+    <tr>
+      <td colspan = "2"></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">Invoice Number: </font></td>
+      <td><font size = "1" align = "right">{$invoice_id}</font></td>
+    </tr>
+    <tr><td  colspan = "5"style = "color:#F5F5F5;"><hr></hr></td></tr>
+    {if $is_pay_later == 1}
+    <tr>
                   <td colspan = "2"></td>
-                  <td><font size = "1" align = "right" style="font-weight:bold;">Amount Due:</font></td> 
-                  <td><font size = "1" align = "right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td> 
-		</tr>
-		{else}
-		<tr>
-		  <td colspan = "2"></td>
-		  <td><font size = "1" align = "right" style="font-weight:bold;">Amount Due: </font></td>
-		  <td><font size = "1" align = "right" style="font-weight:bold;">{$amountDue|crmMoney:$currency}</font></td>   
-		</tr>
-		{/if}
-		<tr>   
-		  <td colspan = "2"></td>
-		  <td><font size = "1" align = "right" style="font-weight:bold;">Due Date:  </font></td>
-		  <td><font size = "1" align = "right">{$dueDate}</font></td>   
-		</tr>
-		<tr>
+                  <td><font size = "1" align = "right" style="font-weight:bold;">Amount Due:</font></td>
+                  <td><font size = "1" align = "right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
+    </tr>
+    {else}
+    <tr>
+      <td colspan = "2"></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">Amount Due: </font></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">{$amountDue|crmMoney:$currency}</font></td>
+    </tr>
+    {/if}
+    <tr>
+      <td colspan = "2"></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">Due Date:  </font></td>
+      <td><font size = "1" align = "right">{$dueDate}</font></td>
+    </tr>
+    <tr>
                   <td colspan = "5" style = "color:#F5F5F5;"><hr></hr></td>
                 </tr>
-	      </table>
+        </table>
             </td>
-	  </tr>   
-	</table>
-	
-	
+    </tr>
+  </table>
+
+
       {if $contribution_status_id == $refundedStatusId}
     <table style = "margin-top:2px;padding-left:7px;page-break-before: always;">
       <tr>
@@ -232,14 +232,14 @@
       </tr>
     </table>
     <center>
-    
+
       <table style = "padding-right:19px;font-family: Arial, Verdana, sans-serif" width = "500" height = "100" border = "0" cellpadding = "2" cellspacing = "1">
-	<tr>         
-          <td style = "padding-left:15px;" ><b><font size = "4" align = "center">CREDIT NOTE</font></b></td>      
+  <tr>
+          <td style = "padding-left:15px;" ><b><font size = "4" align = "center">CREDIT NOTE</font></b></td>
           <td colspan = "1"></td>
-          <td style = "padding-left:70px;"><b><font size = "1" align = "right">Date:</font></b></td>   
-          <td><font size = "1" align = "right">{$domain_organization}</font></td>     
-	</tr>
+          <td style = "padding-left:70px;"><b><font size = "1" align = "right">Date:</font></b></td>
+          <td><font size = "1" align = "right">{$domain_organization}</font></td>
+  </tr>
         <tr>
          {if $organization_name}
            <td style = "padding-left:17px;"><font size = "1" align = "center">{$display_name}  ({$organization_name})</font></td>
@@ -247,67 +247,67 @@
            <td style = "padding-left:17px;"><font size = "1" align = "center">{$display_name}</font></td>
          {/if}
          <td colspan = "1"></td>
-         <td style = "padding-left:70px;"><font size = "1" align = "right">{$invoice_date}</font></td>  
-	 <td ><font size = "1" align = "right"> 
-	{if $domain_street_address } 
-	  {$domain_street_address}
-	{/if}
-	{if $domain_supplemental_address_1 }
-	  {$domain_supplemental_address_1}
-	{/if}</font></td>    
-	</tr>
+         <td style = "padding-left:70px;"><font size = "1" align = "right">{$invoice_date}</font></td>
+   <td ><font size = "1" align = "right">
+  {if $domain_street_address }
+    {$domain_street_address}
+  {/if}
+  {if $domain_supplemental_address_1 }
+    {$domain_supplemental_address_1}
+  {/if}</font></td>
+  </tr>
         <tr>
           <td style = "padding-left:17px;"><font size = "1" align = "center">{$street_address}   {$supplemental_address_1}</font></td>
-          <td colspan = "1"></td>         
-          <td style = "padding-left:70px;"><b><font size = "1" align = "right">Credit Note Number:</font></b></td>     
+          <td colspan = "1"></td>
+          <td style = "padding-left:70px;"><b><font size = "1" align = "right">Credit Note Number:</font></b></td>
           <td><font size = "1" align = "right">{if $domain_supplemental_address_2 }
-		{$domain_supplemental_address_2}
-	      {/if}
-	      {if $domain_state }
-		{$domain_state}
-	      {/if}
-	  </font></td> 
+    {$domain_supplemental_address_2}
+        {/if}
+        {if $domain_state }
+    {$domain_state}
+        {/if}
+    </font></td>
         </tr>
         <tr>
           <td style = "padding-left:17px;"><font size = "1" align = "center">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>
           <td colspan="1"></td>
           <td style = "padding-left:70px;"><font size = "1" align = "right">{$creditnote_id}</font></td>
-	  <td ><font size = "1" align = "right">{if $domain_city}
-		 {$domain_city}
-	       {/if}
-	       {if $domain_postal_code }
-		 {$domain_postal_code}
-	       {/if}	
-	  </font></td>  
-	</tr>
-	<tr>
-          <td style = "padding-left:17px;"><font size = "1" align = "right">{$city}  {$postal_code}</font></td>    
+    <td ><font size = "1" align = "right">{if $domain_city}
+     {$domain_city}
+         {/if}
+         {if $domain_postal_code }
+     {$domain_postal_code}
+         {/if}
+    </font></td>
+  </tr>
+  <tr>
+          <td style = "padding-left:17px;"><font size = "1" align = "right">{$city}  {$postal_code}</font></td>
           <td colspan="1"></td>
-          <td height = "10" style = "padding-left:70px;"><b><font size = "1"align = "right">Reference:</font></b></td>  
-	  <td><font size = "1" align = "right"> {if $domain_country} 
-		{$domain_country}
-	      {/if}</font></td>
-	</tr>
-	<tr>
-          <td></td>    
+          <td height = "10" style = "padding-left:70px;"><b><font size = "1"align = "right">Reference:</font></b></td>
+    <td><font size = "1" align = "right"> {if $domain_country}
+    {$domain_country}
+        {/if}</font></td>
+  </tr>
+  <tr>
           <td></td>
-          <td style = "padding-left:70px;"><font size = "1"align = "right">{$source}</font></td>  
-	  <td><font size = "1" align = "right"> {if $domain_phone}
-		{$domain_phone}
-	       {/if}</font> </td> 
-	</tr>
-	<tr>
-	  <td></td>
-	  <td></td>
-	  <td></td> 
-	  <td><font size = "1" align = "right"> {if $domain_email}
-		{$domain_email}
-	      {/if}</font> </td> 
-	</tr>
+          <td></td>
+          <td style = "padding-left:70px;"><font size = "1"align = "right">{$source}</font></td>
+    <td><font size = "1" align = "right"> {if $domain_phone}
+    {$domain_phone}
+         {/if}</font> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td><font size = "1" align = "right"> {if $domain_email}
+    {$domain_email}
+        {/if}</font> </td>
+  </tr>
       </table>
 
       <table style = "margin-top:75px;font-family: Arial, Verdana, sans-serif" width = "590" border = "0"cellpadding = "-5" cellspacing = "19" id = "desc">
-	<tr>
+  <tr>
           <td colspan = "2" {$valueStyle}>
             <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}
               <tr>
@@ -318,79 +318,79 @@
                 <th style = "padding-left:28px;text-align:right;font-weight:bold;"><font size = "1">Amount {$defaultCurrency}</font></th>
               </tr>
               {foreach from=$lineItem item=value key=priceset name=pricevalue}
-		{if $smarty.foreach.pricevalue.index eq 0}
-	        <tr><td  colspan = "5" ><hr size="3" style = "color:#000;"></hr></td></tr>
-		{else}
-		<tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
-		{/if}
+    {if $smarty.foreach.pricevalue.index eq 0}
+          <tr><td  colspan = "5" ><hr size="3" style = "color:#000;"></hr></td></tr>
+    {else}
+    <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
+    {/if}
                 <tr>
                   <td style ="text-align:left;"  ><font size = "1">
-		  {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}<div>{$value.description|truncate:30:"..."}</div>{/if}
-		  </font></td>
-		  <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.qty}</font></td>
-		  <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.unit_price|crmMoney:$currency}</font></td>
-		    {if $value.tax_amount != ''}
-		      <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.tax_rate}%</font></td>
+      {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}<div>{$value.description|truncate:30:"..."}</div>{/if}
+      </font></td>
+      <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.qty}</font></td>
+      <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.unit_price|crmMoney:$currency}</font></td>
+        {if $value.tax_amount != ''}
+          <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.tax_rate}%</font></td>
                     {else}
-		      <td style = "padding-left:28px;text-align:right"><font size = "1" >No {$taxTerm}</font></td>
-	            {/if}
-		   <td style = "padding-left:28px;text-align:right;"><font size = "1" >{$value.subTotal|crmMoney:$currency}</font></td>
-		</tr>
+          <td style = "padding-left:28px;text-align:right"><font size = "1" >No {$taxTerm}</font></td>
+              {/if}
+       <td style = "padding-left:28px;text-align:right;"><font size = "1" >{$value.subTotal|crmMoney:$currency}</font></td>
+    </tr>
                 {/foreach}
-	        <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
-	        <tr>
-		  <td colspan = "3"></td>
-		  <td style = "padding-left:28px;text-align:right;"><font size = "1">Sub Total</font></td>
-		  <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$subTotal|crmMoney:$currency}</font></td>
-		</tr>
-		{foreach from = $dataArray item = value key = priceset}
-	          <tr>
-		    <td colspan = "3"></td>
-		    {if $priceset}
-		      <td style = "padding-left:28px;text-align:right;"><font size = "1"> TOTAL {$taxTerm} {$priceset}%</font></td>    
-		      <td style = "padding-left:28px;text-align:right;"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
+          <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
+          <tr>
+      <td colspan = "3"></td>
+      <td style = "padding-left:28px;text-align:right;"><font size = "1">Sub Total</font></td>
+      <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$subTotal|crmMoney:$currency}</font></td>
+    </tr>
+    {foreach from = $dataArray item = value key = priceset}
+            <tr>
+        <td colspan = "3"></td>
+        {if $priceset}
+          <td style = "padding-left:28px;text-align:right;"><font size = "1"> TOTAL {$taxTerm} {$priceset}%</font></td>
+          <td style = "padding-left:28px;text-align:right;"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
                     {elseif $priceset == 0}
                       <td style = "padding-left:28px;text-align:right;"><font size = "1">TOTAL NO {$taxTerm}</font></td>
                       <td style = "padding-left:28px;text-align:right;"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
                   </tr>
-		    {/if}
-		{/foreach}
-	        <tr>
-		  <td colspan = "3"></td>
-		  <td colspan = "2"><hr></hr></td>
-		</tr>
+        {/if}
+    {/foreach}
+          <tr>
+      <td colspan = "3"></td>
+      <td colspan = "2"><hr></hr></td>
+    </tr>
 
-	        <tr>
-		  <td colspan = "3"></td>
-		  <td style = "padding-left:28px;text-align:right;"><b><font size = "1">TOTAL {$defaultCurrency}</font></b></td>
-		  <td style = "padding-left:28px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>     
-		</tr>
+          <tr>
+      <td colspan = "3"></td>
+      <td style = "padding-left:28px;text-align:right;"><b><font size = "1">TOTAL {$defaultCurrency}</font></b></td>
+      <td style = "padding-left:28px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
+    </tr>
 
-		{if $is_pay_later == 0}
-	          <tr>
-		    <td colspan = "3"></td>		  
-		    <td style = "padding-left:28px;text-align:right;"><font size = "1" >LESS Credit to invoice(s)</font></td>		      
-		    <td style = "padding-left:28px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
-		  </tr>
-	          <tr>
-		    <td colspan = "3"></td>
-		    <td colspan = "2" ><hr></hr></td>
-		  </tr>
-	          <tr>
-		    <td colspan = "3"></td>		   
-		    <td style = "padding-left:28px;text-align:right;"><b><font size = "1">REMAINING CREDIT</font></b></td>
-		    <td style = "padding-left:28px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>
-		    <td style = "padding-left:28px;"><font size = "1" align = "right"></fonts></td>
-		  </tr>
-		{/if}
-		<br/><br/><br/>
-	        <tr>
-		  <td colspan = "3"></td>
-		</tr>
-	        <tr>
-		  <td></td>
-		  <td colspan = "3"></td>
-		</tr>
+    {if $is_pay_later == 0}
+            <tr>
+        <td colspan = "3"></td>
+        <td style = "padding-left:28px;text-align:right;"><font size = "1" >LESS Credit to invoice(s)</font></td>
+        <td style = "padding-left:28px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
+      </tr>
+            <tr>
+        <td colspan = "3"></td>
+        <td colspan = "2" ><hr></hr></td>
+      </tr>
+            <tr>
+        <td colspan = "3"></td>
+        <td style = "padding-left:28px;text-align:right;"><b><font size = "1">REMAINING CREDIT</font></b></td>
+        <td style = "padding-left:28px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>
+        <td style = "padding-left:28px;"><font size = "1" align = "right"></fonts></td>
+      </tr>
+    {/if}
+    <br/><br/><br/>
+          <tr>
+      <td colspan = "3"></td>
+    </tr>
+          <tr>
+      <td></td>
+      <td colspan = "3"></td>
+    </tr>
             </table>
           </td>
         </tr>
@@ -402,32 +402,32 @@
         </tr>
       </table>
 
-	<table style = "margin-top:6px;padding-right:20px;font-family: Arial, Verdana, sans-serif" width = "507" border = "0"cellpadding = "-5" cellspacing="19" id = "desc">
-	  <tr>
-	    <td width="60%"><font size = "4" align = "right"><b>CREDIT ADVICE</b><br/><br /><div  style="font-size:10px;max-width:300px;">Please do not pay on this advice. Deduct the amount of this Credit Note
+  <table style = "margin-top:6px;padding-right:20px;font-family: Arial, Verdana, sans-serif" width = "507" border = "0"cellpadding = "-5" cellspacing="19" id = "desc">
+    <tr>
+      <td width="60%"><font size = "4" align = "right"><b>CREDIT ADVICE</b><br/><br /><div  style="font-size:10px;max-width:300px;">Please do not pay on this advice. Deduct the amount of this Credit Note
 from your next payment to us</div><br/></font></td>
-	    <td width="40%">
+      <td width="40%">
               <table    align="right" >
-		<tr>
-	          <td colspan = "2"></td>
-		  <td><font size = "1" align = "right" style="font-weight:bold;">Customer: </font></td>
-		  <td><font size = "1" align = "right" >{$display_name}</font></td>   
-		</tr>
-		<tr>
-		  <td colspan = "2"></td>
-		  <td><font size = "1" align = "right" style="font-weight:bold;">Credit Note#: </font></td>
-		  <td><font size = "1" align = "right">{$creditnote_id}</font></td>   
-		</tr>
-		<tr><td  colspan = "5"style = "color:#F5F5F5;"><hr></hr></td></tr>
-		<tr>
+    <tr>
+            <td colspan = "2"></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">Customer: </font></td>
+      <td><font size = "1" align = "right" >{$display_name}</font></td>
+    </tr>
+    <tr>
+      <td colspan = "2"></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">Credit Note#: </font></td>
+      <td><font size = "1" align = "right">{$creditnote_id}</font></td>
+    </tr>
+    <tr><td  colspan = "5"style = "color:#F5F5F5;"><hr></hr></td></tr>
+    <tr>
                   <td colspan = "2"></td>
-		  <td><font size = "1" align = "right" style="font-weight:bold;">Credit Amount:</font></td> 
-		  <td width='50px'><font size = "1" align = "right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td> 
-		</tr>
+      <td><font size = "1" align = "right" style="font-weight:bold;">Credit Amount:</font></td>
+      <td width='50px'><font size = "1" align = "right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
+    </tr>
               </table>
             </td>
-	  </tr>
-	</table>
+    </tr>
+  </table>
  {/if}
     </center>
   </body>
diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl
index 0035d669ed..6cb6bf1a02 100644
--- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl
+++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl
@@ -1,2 +1,2 @@
-{if $title}{if $component}{if $component == 'event'} {ts}Event Registration Invoice:- {$title}{/ts}{else}{ts}Contribution Invoice :  
+{if $title}{if $component}{if $component == 'event'} {ts}Event Registration Invoice:- {$title}{/ts}{else}{ts}Contribution Invoice :
  {$title}{/ts}{/if}{/if} {else} {ts}Invoice {/ts} {/if}
diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_offline_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_offline_receipt_html.tpl
index f24045b0dc..829afa01e3 100644
--- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_offline_receipt_html.tpl
+++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_offline_receipt_html.tpl
@@ -115,7 +115,7 @@
       {foreach from=$dataArray item=value key=priceset}
         <tr>
         {if $priceset ||  $priceset == 0 || $value != ''}
-          <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>    
+          <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>
           <td>&nbsp;{$value|crmMoney:$currency}</td>
         {else}
           <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>
diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_online_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_online_receipt_html.tpl
index 9e583abde0..537f2557d3 100644
--- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_online_receipt_html.tpl
+++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_online_receipt_html.tpl
@@ -112,7 +112,7 @@
         {foreach from=$dataArray item=value key=priceset}
          <tr>
           {if $priceset || $priceset == 0}
-           <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>    
+           <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>
            <td>&nbsp;{$value|crmMoney:$currency}</td>
           {else}
            <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>
diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl
index 81a73f98b1..ca7d00dd45 100644
--- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl
+++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl
@@ -130,8 +130,8 @@ registration process.{/ts}</p>
        {/if}
       {/foreach}
      {/if}
-	 
-     {if $event.is_public} 
+
+     {if $event.is_public}
       <tr>
        <td colspan="2" {$valueStyle}>
         {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
@@ -139,7 +139,7 @@ registration process.{/ts}</p>
        </td>
       </tr>
      {/if}
-	 
+
      {if $email}
       <tr>
        <th {$headerStyle}>
@@ -243,7 +243,7 @@ registration process.{/ts}</p>
         {foreach from=$dataArray item=value key=priceset}
           <tr>
            {if $priceset || $priceset == 0}
-            <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>    
+            <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>
             <td>&nbsp;{$value|crmMoney:$currency}</td>
            {else}
             <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>
diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl
index f359f7e72e..89eada777d 100644
--- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl
+++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl
@@ -83,7 +83,7 @@ registration process.{/ts}
 {ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}
 {/if}
 
-{if $event.is_public} 
+{if $event.is_public}
 {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
 {ts}Download iCalendar File:{/ts} {$icalFeed}
 {/if}
diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_html.tpl
index d3e6f0790d..9cd8aecfa4 100644
--- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_html.tpl
+++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_html.tpl
@@ -158,8 +158,8 @@ registration process.{/ts}</p>
        {/if}
       {/foreach}
      {/if}
-	 
-     {if $event.is_public} 
+
+     {if $event.is_public}
       <tr>
        <td colspan="2" {$valueStyle}>
         {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
@@ -167,7 +167,7 @@ registration process.{/ts}</p>
        </td>
       </tr>
      {/if}
-	 
+
     {if $event.is_share}
         <tr>
             <td colspan="2" {$valueStyle}>
@@ -273,7 +273,7 @@ registration process.{/ts}</p>
         {foreach from=$dataArray item=value key=priceset}
          <tr>
           {if $priceset || $priceset == 0}
-           <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>    
+           <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>
            <td>&nbsp;{$value|crmMoney:$currency}</td>
           {else}
            <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>
diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_text.tpl
index a8434ccfc9..38830ee1e3 100644
--- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_text.tpl
+++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_text.tpl
@@ -105,7 +105,7 @@ registration process.{/ts}
 {ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}
 {/if}
 
-{if $event.is_public} 
+{if $event.is_public}
 {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
 {ts}Download iCalendar File:{/ts} {$icalFeed}
 {/if}
diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_offline_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_offline_receipt_html.tpl
index 45f339420f..039b659f54 100644
--- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_offline_receipt_html.tpl
+++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_offline_receipt_html.tpl
@@ -155,7 +155,7 @@
        {foreach from=$dataArray item=value key=priceset}
         <tr>
         {if $priceset}
-         <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>    
+         <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>
          <td>&nbsp;{$value|crmMoney:$currency}</td>
         {elseif  $priceset == 0}
          <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>
diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_online_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_online_receipt_html.tpl
index 6fc789a6b4..b4d8619b2f 100644
--- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_online_receipt_html.tpl
+++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_online_receipt_html.tpl
@@ -231,7 +231,7 @@
         {foreach from=$dataArray item=value key=priceset}
          <tr>
          {if $priceset || $priceset == 0}
-           <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>    
+           <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>
            <td>&nbsp;{$value|crmMoney:$currency}</td>
          {else}
            <td>&nbsp;{ts}NO{/ts} {$taxTerm}</td>
diff --git a/CRM/Upgrade/Incremental/sql/4.3.6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.3.6.mysql.tpl
index 5aae59df6a..e693e84752 100644
--- a/CRM/Upgrade/Incremental/sql/4.3.6.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.3.6.mysql.tpl
@@ -6,13 +6,13 @@ LEFT JOIN civicrm_price_field cpf ON cps.id = cpf.price_set_id
 LEFT JOIN civicrm_price_field_value cpfv ON cpf.id = cpfv.price_field_id
 LEFT JOIN civicrm_event ce ON cpse.entity_id = ce.id AND cpse.entity_table = 'civicrm_event'
 LEFT JOIN civicrm_contribution_page ccg ON cpse.entity_id = ccg.id AND cpse.entity_table = 'civicrm_contribution_page'
-SET cpfv.financial_type_id = CASE 
+SET cpfv.financial_type_id = CASE
   WHEN ce.id IS NOT NULL
     THEN ce.financial_type_id
   WHEN ccg.id IS NOT NULL
     THEN ccg.financial_type_id
 END,
-cps.financial_type_id = CASE 
+cps.financial_type_id = CASE
   WHEN ce.id IS NOT NULL
     THEN ce.financial_type_id
   WHEN ccg.id IS NOT NULL
@@ -23,11 +23,11 @@ WHERE cps.is_quick_config = 1;
 -- CRM-12844
 -- DELETE bad data
 DELETE cli FROM `civicrm_contribution` cc
-LEFT JOIN civicrm_line_item cli ON cli.entity_id = cc.id 
-LEFT JOIN civicrm_financial_item cfi ON cfi.entity_id = cli.id AND cfi.entity_table = 'civicrm_line_item' 
+LEFT JOIN civicrm_line_item cli ON cli.entity_id = cc.id
+LEFT JOIN civicrm_financial_item cfi ON cfi.entity_id = cli.id AND cfi.entity_table = 'civicrm_line_item'
 LEFT JOIN civicrm_price_field cpf ON cpf.id = cli.price_field_id
 LEFT JOIN civicrm_price_set cps ON cps.id = cpf.price_set_id
-WHERE cc.contribution_recur_id IS NOT NULL 
+WHERE cc.contribution_recur_id IS NOT NULL
 AND cli.entity_table = 'civicrm_contribution' AND cfi.id IS NULL
 AND cps.is_quick_config = 1;
 
@@ -35,7 +35,7 @@ AND cps.is_quick_config = 1;
 UPDATE `civicrm_contribution` cc
 LEFT JOIN civicrm_entity_financial_trxn ceft ON ceft.entity_id = cc.id
 LEFT JOIN civicrm_financial_trxn cft ON cft.id = ceft.financial_trxn_id
-LEFT JOIN civicrm_entity_financial_trxn ceft1 ON ceft1.financial_trxn_id = ceft.financial_trxn_id 
+LEFT JOIN civicrm_entity_financial_trxn ceft1 ON ceft1.financial_trxn_id = ceft.financial_trxn_id
 LEFT JOIN civicrm_financial_item cfi ON cfi.id = ceft1.entity_id
 LEFT JOIN civicrm_entity_financial_account cefa ON cefa.entity_id = cft.payment_processor_id
 SET cft.from_financial_account_id = NULL
@@ -64,7 +64,7 @@ INSERT INTO civicrm_entity_financial_account(entity_table, entity_id, account_re
 SELECT 'civicrm_financial_type', cft.id, @option_value_rel_id_exp, @financialAccountId
 FROM civicrm_financial_type cft
 LEFT JOIN civicrm_entity_financial_account ceft
-ON ceft.entity_id = cft.id AND ceft.account_relationship = @option_value_rel_id_exp AND ceft.entity_table = 'civicrm_financial_type' 
+ON ceft.entity_id = cft.id AND ceft.account_relationship = @option_value_rel_id_exp AND ceft.entity_table = 'civicrm_financial_type'
 WHERE ceft.entity_id IS NULL;
 
 UPDATE  civicrm_financial_trxn cft
@@ -92,5 +92,5 @@ INSERT INTO civicrm_entity_financial_account(entity_table, entity_id, account_re
 SELECT 'civicrm_financial_type', cft.id, @option_value_rel_id_cg, @financialAccountId
 FROM civicrm_financial_type cft
 LEFT JOIN civicrm_entity_financial_account ceft
-ON ceft.entity_id = cft.id AND ceft.account_relationship = @option_value_rel_id_cg AND ceft.entity_table = 'civicrm_financial_type' 
-WHERE ceft.entity_id IS NULL;
\ No newline at end of file
+ON ceft.entity_id = cft.id AND ceft.account_relationship = @option_value_rel_id_cg AND ceft.entity_table = 'civicrm_financial_type'
+WHERE ceft.entity_id IS NULL;
diff --git a/CRM/Upgrade/Incremental/sql/4.4.4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.4.4.mysql.tpl
index a213705631..3244650630 100644
--- a/CRM/Upgrade/Incremental/sql/4.4.4.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.4.4.mysql.tpl
@@ -7,11 +7,11 @@ ALTER TABLE civicrm_report_instance MODIFY grouprole varchar(1024) COLLATE utf8_
 UPDATE civicrm_navigation SET url = 'http://civicrm.org/what/whatiscivicrm' WHERE name = 'About';
 
 -- CRM-13968
-SELECT @inprogressstatus := value FROM civicrm_option_value cov 
+SELECT @inprogressstatus := value FROM civicrm_option_value cov
 LEFT JOIN civicrm_option_group cg ON cov.option_group_id = cg.id
 WHERE cg.name = 'contribution_status'  AND cov.name = 'In Progress';
 
-SELECT @financialstatus := value FROM civicrm_option_value cov 
+SELECT @financialstatus := value FROM civicrm_option_value cov
 LEFT JOIN civicrm_option_group cg ON cov.option_group_id = cg.id
 WHERE cg.name = 'financial_item_status'  AND cov.name = 'Unpaid';
 
@@ -25,4 +25,4 @@ SET to_financial_account_id = @accountrecievable, cfi.status_id = @financialstat
 WHERE ceft.entity_table = 'civicrm_contribution' AND ceft_financial_item.entity_table = 'civicrm_financial_item' AND cft.status_id = @inprogressstatus AND cfi.status_id  IS NULL;
 
 {* CRM-14167 *}
-ALTER TABLE civicrm_activity_contact ADD INDEX index_record_type ( activity_id, record_type_id );
\ No newline at end of file
+ALTER TABLE civicrm_activity_contact ADD INDEX index_record_type ( activity_id, record_type_id );
diff --git a/CRM/Upgrade/Incremental/sql/4.4.5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.4.5.mysql.tpl
index 96cad6f5e0..a81e2a8a5b 100644
--- a/CRM/Upgrade/Incremental/sql/4.4.5.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.4.5.mysql.tpl
@@ -3,7 +3,7 @@
 SELECT @option_group_id_batch_status   := max(id) from civicrm_option_group where name = 'batch_status';
 SELECT @weight := MAX(value) FROM civicrm_option_value WHERE option_group_id = @option_group_id_batch_status;
 
-UPDATE civicrm_option_value 
+UPDATE civicrm_option_value
 SET value = (Select @weight := @weight +1),
 weight = @weight
 WHERE option_group_id = @option_group_id_batch_status AND name IN ('Data Entry', 'Reopened', 'Exported') AND value = 0 ORDER BY id;
@@ -11,7 +11,7 @@ WHERE option_group_id = @option_group_id_batch_status AND name IN ('Data Entry',
 SELECT @option_group_id_batch_modes := max(id) from civicrm_option_group where name = 'batch_mode';
 SELECT @weights := MAX(value) FROM civicrm_option_value WHERE option_group_id = @option_group_id_batch_modes;
 
-UPDATE civicrm_option_value 
+UPDATE civicrm_option_value
 SET value = (Select @weights := @weights +1),
 weight = @weights
 WHERE option_group_id = @option_group_id_batch_modes AND name IN ('Manual Batch', 'Automatic Batch') AND value = 0;
@@ -30,7 +30,7 @@ SELECT @export_activity_type := max(value) FROM civicrm_option_value cov
 INNER JOIN civicrm_option_group cog ON cog.id = cov.option_group_id
 WHERE cog.name = 'activity_type' AND cov.name = 'Export Accounting Batch';
 
-UPDATE civicrm_batch cb 
+UPDATE civicrm_batch cb
 INNER JOIN civicrm_activity ca ON ca.source_record_id = cb.id
-SET cb.status_id = @exported_status_id 
-WHERE cb.status_id = 0 AND ca.activity_type_id = @export_activity_type; 
\ No newline at end of file
+SET cb.status_id = @exported_status_id
+WHERE cb.status_id = 0 AND ca.activity_type_id = @export_activity_type;
diff --git a/CRM/Upgrade/Incremental/sql/4.5.beta7.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.beta7.mysql.tpl
index 16e8767696..15c91a5eb1 100644
--- a/CRM/Upgrade/Incremental/sql/4.5.beta7.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.5.beta7.mysql.tpl
@@ -1,2 +1,2 @@
 {* file to handle db changes in 4.5.beta7 during upgrade *}
-UPDATE civicrm_contribution SET net_amount = total_amount - fee_amount WHERE net_amount = 0 OR net_amount IS NULL; 
+UPDATE civicrm_contribution SET net_amount = total_amount - fee_amount WHERE net_amount = 0 OR net_amount IS NULL;
diff --git a/CRM/Utils/Date.php b/CRM/Utils/Date.php
index d997cdacca..883f72bb28 100644
--- a/CRM/Utils/Date.php
+++ b/CRM/Utils/Date.php
@@ -1110,7 +1110,7 @@ class CRM_Utils_Date {
             $difference = 2;
             $quarter    = ceil($now['mon'] / 3);
             $quarter    = $quarter - $difference;
-            $subtractYear = 0;  
+            $subtractYear = 0;
             if ($quarter <= 0) {
               $subtractYear = 1;
               $quarter += 4;
@@ -1161,7 +1161,7 @@ class CRM_Utils_Date {
 
           case 'earlier':
             $quarter = ceil($now['mon'] / 3) - 1;
-            $subtractYear = 0;  
+            $subtractYear = 0;
             if ($quarter <= 0) {
               $subtractYear = 1;
               $quarter += 4;
@@ -1179,10 +1179,10 @@ class CRM_Utils_Date {
             $from['Y'] = $now['year'];
             unset($to);
             break;
- 
+
           case 'greater_previous':
             $quarter = ceil($now['mon'] / 3) - 1;
-            $subtractYear    = 0;            
+            $subtractYear    = 0;
             if ($quarter <= 0) {
               $subtractYear = 1;
               $quarter += 4;
diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php
index 10d5d8937f..dd81e28872 100644
--- a/CRM/Utils/Token.php
+++ b/CRM/Utils/Token.php
@@ -1364,11 +1364,11 @@ class CRM_Utils_Token {
           $escapeSmarty
         );
       }
-      
+
       // check if there are still any unevaluated tokens
       $remainingTokens = self::getTokens($tokenString);
 
-      // contact related $greetingTokens not empty, there are customized or hook tokens to replace 
+      // contact related $greetingTokens not empty, there are customized or hook tokens to replace
       if (!empty($remainingTokens['contact']) ) {
         // Fill the return properties array
         $greetingTokens = $remainingTokens['contact'];
diff --git a/templates/CRM/Group/Form/Search.tpl b/templates/CRM/Group/Form/Search.tpl
index 526116c7b6..61b8e34858 100644
--- a/templates/CRM/Group/Form/Search.tpl
+++ b/templates/CRM/Group/Form/Search.tpl
@@ -107,7 +107,7 @@ CRM.$(function($) {
     .on('click', 'a.button, a.action-item[href*="action=update"], a.action-item[href*="action=delete"]', CRM.popup)
     .on('crmPopupFormSuccess', 'a.button, a.action-item[href*="action=update"], a.action-item[href*="action=delete"]', function() {
         // Refresh datatable when form completes
-      	var $context = $('#crm-main-content-wrapper');
+        var $context = $('#crm-main-content-wrapper');
         $('table.crm-group-selector', $context).dataTable().fnDraw();
     });
 
diff --git a/templates/CRM/Price/Form/PriceSet.tpl b/templates/CRM/Price/Form/PriceSet.tpl
index 73e41056bc..1c61d27a7f 100644
--- a/templates/CRM/Price/Form/PriceSet.tpl
+++ b/templates/CRM/Price/Form/PriceSet.tpl
@@ -28,10 +28,10 @@
         <div class="messages help">{$priceSet.help_pre}</div>
     {/if}
 
-		{assign var='adminFld' value=false}
-		{if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM') }
-			{assign var='adminFld' value=true}
-		{/if}
+    {assign var='adminFld' value=false}
+    {if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM') }
+      {assign var='adminFld' value=true}
+    {/if}
 
     {foreach from=$priceSet.fields item=element key=field_id}
         {* Skip 'Admin' visibility price fields WHEN this tpl is used in online registration unless user has administer CiviCRM permission. *}
@@ -71,21 +71,21 @@
                   {if $element.is_display_amounts && $element.html_type eq 'Text'}
                     <span class="price-field-amount">
                       {foreach item=option from=$element.options}
-		        {if ($option.tax_amount || $option.tax_amount == "0") && $displayOpt && $invoicing}
-			  {assign var="amount" value=`$option.amount+$option.tax_amount`}
-			  {if $displayOpt == 'Do_not_show'}
-			    {$amount|crmMoney}
-			  {elseif $displayOpt == 'Inclusive'}
-			    {$amount|crmMoney}
-			    <span class='crm-price-amount-label'> (includes {$taxTerm} of {$option.tax_amount|crmMoney})</span>
-			  {else}
-			    {$option.amount|crmMoney}
-			    <span class='crm-price-amount-label'> + {$option.tax_amount|crmMoney} {$taxTerm}</span>
-			  {/if}
-			{else}
-			  {$option.amount|crmMoney}
-			{/if}
-		      {/foreach}
+            {if ($option.tax_amount || $option.tax_amount == "0") && $displayOpt && $invoicing}
+        {assign var="amount" value=`$option.amount+$option.tax_amount`}
+        {if $displayOpt == 'Do_not_show'}
+          {$amount|crmMoney}
+        {elseif $displayOpt == 'Inclusive'}
+          {$amount|crmMoney}
+          <span class='crm-price-amount-label'> (includes {$taxTerm} of {$option.tax_amount|crmMoney})</span>
+        {else}
+          {$option.amount|crmMoney}
+          <span class='crm-price-amount-label'> + {$option.tax_amount|crmMoney} {$taxTerm}</span>
+        {/if}
+      {else}
+        {$option.amount|crmMoney}
+      {/if}
+          {/foreach}
                     </span>
                   {/if}
                       {if $element.help_post}<br /><span class="description">{$element.help_post}</span>{/if}
@@ -105,4 +105,4 @@
 {if !$quickConfig and !$dontInclCal}
     {include file="CRM/Price/Form/Calculate.tpl"}
 {/if}
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/CRM/Price/Page/Field.tpl b/templates/CRM/Price/Page/Field.tpl
index 5aa2cf32ce..28fdf69c33 100644
--- a/templates/CRM/Price/Page/Field.tpl
+++ b/templates/CRM/Price/Page/Field.tpl
@@ -86,7 +86,7 @@
             <td>{if $row.tax_rate != '' && $row.html_type eq "Text / Numeric Quantity"}
                     {$taxTerm} ({$row.tax_rate|string_format:"%.2f"}%)
                 {/if}
-	    </td>
+      </td>
             <td>{if $row.html_type eq "Text / Numeric Quantity" }{$row.tax_amount|crmMoney}{/if}</td>
         {/if}
         <td class="field-action">{$row.action|replace:'xx':$row.id}</td>
diff --git a/templates/CRM/Price/Page/LineItem.tpl b/templates/CRM/Price/Page/LineItem.tpl
index 4813ffea73..509c17f5c4 100644
--- a/templates/CRM/Price/Page/LineItem.tpl
+++ b/templates/CRM/Price/Page/LineItem.tpl
@@ -63,23 +63,23 @@
           {if $context NEQ "Membership"}
             <td class="right">{$line.qty}</td>
             <td class="right">{$line.unit_price|crmMoney}</td>
-	  {else}
+    {else}
             <td class="right">{$line.line_total|crmMoney}</td>
           {/if}
-	  {if !$getTaxDetails && $context NEQ "Membership"}
-	    <td class="right">{$line.line_total|crmMoney}</td>
-	  {/if}
-	  {if $getTaxDetails}
-	    <td class="right">{$line.line_total|crmMoney}</td>
-	    {if $line.tax_rate != "" || $line.tax_amount != ""}
-	      <td class="right">{$taxTerm} ({$line.tax_rate|string_format:"%.2f"}%)</td>
-	      <td class="right">{$line.tax_amount|crmMoney}</td>
-	    {else}
-	      <td></td>
-	      <td></td>
-	    {/if}
-	    <td class="right">{$line.line_total+$line.tax_amount|crmMoney}</td>
-	  {/if}
+    {if !$getTaxDetails && $context NEQ "Membership"}
+      <td class="right">{$line.line_total|crmMoney}</td>
+    {/if}
+    {if $getTaxDetails}
+      <td class="right">{$line.line_total|crmMoney}</td>
+      {if $line.tax_rate != "" || $line.tax_amount != ""}
+        <td class="right">{$taxTerm} ({$line.tax_rate|string_format:"%.2f"}%)</td>
+        <td class="right">{$line.tax_amount|crmMoney}</td>
+      {else}
+        <td></td>
+        <td></td>
+      {/if}
+      <td class="right">{$line.line_total+$line.tax_amount|crmMoney}</td>
+    {/if}
           {if $pricesetFieldsCount}
             <td class="right">{$line.participant_count}</td>
           {/if}
-- 
2.25.1