From 66cae70584f43f4d98a9a08b686487f9a0353d00 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Wed, 29 Oct 2014 15:25:16 +1300
Subject: [PATCH] more whitespace -remove trailing spaces

---
 js/jquery/jquery.crmasmselect.js              | 138 ++++++-------
 sql/civicrm_upgradedb_v1.2_v1.3_40.mysql      | 134 ++++++-------
 sql/civicrm_upgradedb_v1.2_v1.3_41.mysql      | 144 +++++++-------
 sql/civicrm_upgradedb_v1.3_v1.4_40.mysql      |  72 +++----
 sql/civicrm_upgradedb_v1.3_v1.4_41.mysql      |  64 +++---
 sql/civicrm_upgradedb_v1.4_v1.5_40.mysql      | 184 +++++++++---------
 sql/civicrm_upgradedb_v1.4_v1.5_41.mysql      | 184 +++++++++---------
 sql/civicrm_upgradedb_v1.5_v1.6_40.mysql      | 132 ++++++-------
 sql/civicrm_upgradedb_v1.5_v1.6_41.mysql      | 124 ++++++------
 sql/civicrm_upgradedb_v1.6_v1.7_40.mysql      |  50 ++---
 sql/civicrm_upgradedb_v1.8_v1.9_41.mysql      |  48 ++---
 .../CRM/Admin/Page/Extensions/AddNew.tpl      |   2 +-
 templates/CRM/Badge/Form/Layout.js            |   2 +-
 templates/CRM/Badge/Form/Layout.tpl           |   6 +-
 .../Page/Petition/SocialNetwork.drupal        |  40 ++--
 templates/CRM/Case/Form/CaseView.tpl          |   4 +-
 .../Edit/Address/country_state_province.tpl   |   2 +-
 .../Event/Form/ParticipantFeeSelection.tpl    |  12 +-
 tests/fixtures/contacts.yaml                  | 144 +++++++-------
 .../CRM/Core/BAO/RecurringEntityTest.php      |  32 +--
 .../Contribute/UpdateContributionTest.php     |   2 +-
 tools/scripts/release-testing/upgrader.sh.txt |  20 +-
 tools/templates/CRM/Auction/Form/Auction.tpl  |  12 +-
 tools/templates/CRM/Auction/Page/Item.tpl     |  84 ++++----
 xml/schema/Case/CaseContact.xml               |   2 +-
 xml/schema/Core/RecurringEntity.xml           |   2 +-
 xml/templates/case_sample.tpl                 |   2 +-
 xml/templates/civicrm_data.tpl                |   4 +-
 .../contribution_invoice_receipt_subject.tpl  |   2 +-
 .../membership_offline_receipt_html.tpl       |   2 +-
 .../membership_online_receipt_html.tpl        |   2 +-
 .../participant_confirm_html.tpl              |   2 +-
 ...sive Design Newsletter - Single Column.tpl |  12 +-
 ...ponsive Design Newsletter - Two Column.tpl |   4 +-
 34 files changed, 837 insertions(+), 833 deletions(-)

diff --git a/js/jquery/jquery.crmasmselect.js b/js/jquery/jquery.crmasmselect.js
index 49b93e1239..609b899611 100644
--- a/js/jquery/jquery.crmasmselect.js
+++ b/js/jquery/jquery.crmasmselect.js
@@ -71,13 +71,13 @@
 					.attr('id', options.listClass + index);
 
 				$container = $("<div></div>")
-					.addClass(options.containerClass) 
-					.attr('id', options.containerClass + index); 
+					.addClass(options.containerClass)
+					.attr('id', options.containerClass + index);
 
 				buildSelect();
 
 				$select.change(selectChangeEvent)
-					.click(selectClickEvent); 
+					.click(selectClickEvent);
 
 				$original.change(originalChangeEvent)
 					.wrap($container).before($select).before($ol);
@@ -102,31 +102,31 @@
 
 						$(this).children("li").each(function(n) {
 
-							$option = $('#' + $(this).attr('rel')); 
+							$option = $('#' + $(this).attr('rel'));
 
 							if($(this).is(".ui-sortable-helper")) {
-								updatedOptionId = $option.attr('id'); 
+								updatedOptionId = $option.attr('id');
 								return;
 							}
 
-							$original.append($option); 
-						}); 
+							$original.append($option);
+						});
 
-						if(updatedOptionId) triggerOriginalChange(updatedOptionId, 'sort'); 
+						if(updatedOptionId) triggerOriginalChange(updatedOptionId, 'sort');
 					}
 
-				}).addClass(options.listSortableClass); 
+				}).addClass(options.listSortableClass);
 			}
 
 			function selectChangeEvent(e) {
-				
+
 				// an item has been selected on the regular select we created
 				// check to make sure it's not an IE screwup, and add it to the list
 
 				if($.browser.msie && $.browser.version < 7 && !ieClick) return;
-				var id = $(this).children("option:selected").slice(0,1).attr('rel'); 
-				addListItem(id); 	
-				ieClick = false; 
+				var id = $(this).children("option:selected").slice(0,1).attr('rel');
+				addListItem(id);
+				ieClick = false;
 				triggerOriginalChange(id, 'add'); // for use by user-defined callbacks
 			}
 
@@ -136,7 +136,7 @@
 				// making sure a click preceded the change() event reduces the chance
 				// if unintended items being added. there may be a better solution?
 
-				ieClick = true; 
+				ieClick = true;
 			}
 
 			function originalChangeEvent(e) {
@@ -145,8 +145,8 @@
 				// on the original <select multiple>, so rebuild ours
 
 				if(ignoreOriginalChangeEvent) {
-					ignoreOriginalChangeEvent = false; 
-					return; 
+					ignoreOriginalChangeEvent = false;
+					return;
 				}
 
 				$select.empty();
@@ -163,31 +163,31 @@
 				// build or rebuild the new select that the user
 				// will select items from
 
-				buildingSelect = true; 
+				buildingSelect = true;
 
 				// add a first option to be the home option / default selectLabel
-				$select.prepend("<option>" + $original.attr('title') + "</option>"); 
+				$select.prepend("<option>" + $original.attr('title') + "</option>");
 
 				$original.children("option").each(function(n) {
 
-					var $t = $(this); 
-					var id; 
+					var $t = $(this);
+					var id;
 
-					if(!$t.attr('id')) $t.attr('id', 'asm' + index + 'option' + n); 
+					if(!$t.attr('id')) $t.attr('id', 'asm' + index + 'option' + n);
 					id = $t.attr('id');
-					classes = $t.attr('class'); 
+					classes = $t.attr('class');
 
 					if($t.is(":selected")) {
-						addListItem(id); 
-						addSelectOption(id, classes, true); 						
+						addListItem(id);
+						addSelectOption(id, classes, true);
 					} else {
-						addSelectOption(id,classes); 
+						addSelectOption(id,classes);
 					}
 				});
 
 				if(!options.debugMode) $original.hide(); // IE6 requires this on every buildSelect()
 				selectFirstItem();
-				buildingSelect = false; 
+				buildingSelect = false;
 			}
 
 			function addSelectOption(optionId, optionClasses, disabled) {
@@ -195,17 +195,17 @@
 				// add an <option> to the <select>
 				// used only by buildSelect()
 
-				if(disabled == undefined) var disabled = false; 
+				if(disabled == undefined) var disabled = false;
 
-				var $O = $('#' + optionId); 
+				var $O = $('#' + optionId);
 				var $option = $("<option>" + $O.text() + "</option>")
 					.val($O.val())
 					.attr('rel', optionId)
 					.addClass(optionClasses);
 
-				if(disabled) disableSelectOption($option); 
+				if(disabled) disableSelectOption($option);
 
-				$select.append($option); 
+				$select.append($option);
 			}
 
 			function selectFirstItem() {
@@ -244,7 +244,7 @@
 
 				// add a new item to the html list
 
-				var $O = $('#' + optionId); 
+				var $O = $('#' + optionId);
 
 				if(!$O) return; // this is the first item, selectLabel
 
@@ -252,14 +252,14 @@
 					.attr("href", "#")
 					.addClass(options.removeClass)
 					.prepend(options.removeLabel)
-					.click(function() { 
-						dropListItem($(this).parent('li').attr('rel')); 
-						return false; 
-					}); 
+					.click(function() {
+						dropListItem($(this).parent('li').attr('rel'));
+						return false;
+					});
 
 				var $itemLabel = $("<span></span>")
 					.addClass(options.listItemLabelClass)
-					.html($O.html()); 
+					.html($O.html());
 
 				var $item = $("<li></li>")
 					.attr('rel', optionId)
@@ -275,25 +275,25 @@
 				}
 
 				if(options.addItemTarget == 'top' && !buildingSelect) {
-					$ol.prepend($item); 
-					if(options.sortable) $original.prepend($O); 
+					$ol.prepend($item);
+					if(options.sortable) $original.prepend($O);
 				} else {
-					$ol.append($item); 
-					if(options.sortable) $original.append($O); 
+					$ol.append($item);
+					if(options.sortable) $original.append($O);
 				}
 
-				addListItemShow($item); 
+				addListItemShow($item);
 
 				disableSelectOption($("[rel=" + optionId + "]", $select));
 
 				if(!buildingSelect) {
-					setHighlight($item, options.highlightAddedLabel); 
+					setHighlight($item, options.highlightAddedLabel);
 					selectFirstItem();
-					if(options.sortable) $ol.sortable("refresh"); 	
+					if(options.sortable) $ol.sortable("refresh");
 				}
-				
+
 				if(options.respectParents) {
-				
+
 				if($O.hasClass('child')) {
 					parentName = $O.attr('class').split('parent-')[1];
 					parentName = parentName.split(' ')[0];
@@ -312,15 +312,15 @@
 					$item.animate({
 						opacity: "show",
 						height: "show"
-					}, 100, "swing", function() { 
+					}, 100, "swing", function() {
 						$item.animate({
 							height: "+=2px"
 						}, 50, "swing", function() {
 							$item.animate({
 								height: "-=2px"
-							}, 25, "swing"); 
-						}); 
-					}); 
+							}, 25, "swing");
+						});
+					});
 				} else {
 					$item.show();
 				}
@@ -330,19 +330,19 @@
 
 				// remove an item from the html list
 
-				if(highlightItem == undefined) var highlightItem = true; 
-				var $O = $('#' + optionId); 
+				if(highlightItem == undefined) var highlightItem = true;
+				var $O = $('#' + optionId);
 
 				$O.prop('selected', false);
 				$item = $ol.children("li[rel=" + optionId + "]");
 
-				dropListItemHide($item); 
+				dropListItemHide($item);
 				enableSelectOption($("[rel=" + optionId + "]", options.removeWhenAdded ? $selectRemoved : $select));
 
-				if(highlightItem) setHighlight($item, options.highlightRemovedLabel); 
+				if(highlightItem) setHighlight($item, options.highlightRemovedLabel);
+
+				triggerOriginalChange(optionId, 'drop');
 
-				triggerOriginalChange(optionId, 'drop'); 
-				
 			}
 
 			function dropListItemHide($item) {
@@ -363,13 +363,13 @@
 						}, 50, "swing", function() {
 							$prevItem.animate({
 								height: "+=2px"
-							}, 100, "swing"); 
-						}); 
-						$item.remove(); 
-					}); 
-					
+							}, 100, "swing");
+						});
+						$item.remove();
+					});
+
 				} else {
-					$item.remove(); 
+					$item.remove();
 				}
 			}
 
@@ -379,7 +379,7 @@
 				// directly after the <select> single
 				// fade it in quickly, then fade it out
 
-				if(!options.highlight) return; 
+				if(!options.highlight) return;
 
 				$select.next("#" + options.highlightClass + index).remove();
 
@@ -387,13 +387,13 @@
 					.hide()
 					.addClass(options.highlightClass)
 					.attr('id', options.highlightClass + index)
-					.html(label + $item.children("." + options.listItemLabelClass).slice(0,1).text()); 
-					
-				$select.after($highlight); 
+					.html(label + $item.children("." + options.listItemLabelClass).slice(0,1).text());
+
+				$select.after($highlight);
 
 				$highlight.fadeIn("fast", function() {
-					setTimeout(function() { $highlight.fadeOut("slow"); }, 50); 
-				}); 
+					setTimeout(function() { $highlight.fadeOut("slow"); }, 50);
+				});
 			}
 
 			function triggerOriginalChange(optionId, type) {
@@ -401,8 +401,8 @@
 				// trigger a change event on the original select multiple
 				// so that other scripts can pick them up
 
-				ignoreOriginalChangeEvent = true; 
-				$option = $("#" + optionId); 
+				ignoreOriginalChangeEvent = true;
+				$option = $("#" + optionId);
 
 				$original.trigger('change', [{
 					'option': $option,
diff --git a/sql/civicrm_upgradedb_v1.2_v1.3_40.mysql b/sql/civicrm_upgradedb_v1.2_v1.3_40.mysql
index 9c7d163272..3fb27e69fe 100644
--- a/sql/civicrm_upgradedb_v1.2_v1.3_40.mysql
+++ b/sql/civicrm_upgradedb_v1.2_v1.3_40.mysql
@@ -40,7 +40,7 @@ CREATE TABLE civicrm_accept_credit_card (
      name varchar(64)    COMMENT ' Credit Card Type as defined by the payment processor.',
      title varchar(64)    COMMENT 'Descriptive Credit Card Name.',
      is_reserved tinyint    COMMENT 'Is this a predefined system object?',
-     is_active tinyint    COMMENT 'Is this property active?' 
+     is_active tinyint    COMMENT 'Is this property active?'
 ,
     PRIMARY KEY ( id )
 
@@ -67,25 +67,25 @@ CREATE TABLE civicrm_contribution_type (
      description varchar(255)    COMMENT 'Contribution Type Description.',
      is_deductible tinyint   DEFAULT 1 COMMENT 'Is this contribution type tax-deductible? If true, contributions of this type may be fully OR partially deductible - non-deductible amount is stored in the Contribution record.',
      is_reserved tinyint    COMMENT 'Is this a predefined system object?',
-     is_active tinyint    COMMENT 'Is this property active?' 
+     is_active tinyint    COMMENT 'Is this property active?'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     UNIQUE INDEX UI_name_domain_id(
         name
       , domain_id
   )
-  
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
 -- *
 -- * civicrm_payment_instrument
 -- *
--- * 
+-- *
 -- *
 -- *******************************************************/
 
@@ -97,18 +97,18 @@ CREATE TABLE civicrm_payment_instrument (
      name varchar(64)    COMMENT ' Payment Instrument Name.',
      description varchar(255)    COMMENT ' Payment Instrument Description.',
      is_reserved tinyint    COMMENT 'Is this a predefined system object?',
-     is_active tinyint    COMMENT 'Is this property active?' 
+     is_active tinyint    COMMENT 'Is this property active?'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     UNIQUE INDEX UI_name_domain_id(
         name
       , domain_id
   )
-  
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -119,7 +119,7 @@ CREATE TABLE civicrm_payment_instrument (
 -- *
 -- *
 -- *******************************************************/
- 
+
    CREATE TABLE civicrm_contribution (
 
 
@@ -140,10 +140,10 @@ CREATE TABLE civicrm_payment_instrument (
      cancel_reason text    ,
      receipt_date datetime    COMMENT 'when (if) receipt was sent; populated automatically for online donations w/ automatic receipting',
      thankyou_date datetime    COMMENT 'when (if) was donor thanked',
-     source varchar(255)    COMMENT 'Origin of this Contribution.' 
+     source varchar(255)    COMMENT 'Origin of this Contribution.'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     UNIQUE INDEX UI_contrib_trxn_id_domain_id(
         trxn_id
       , domain_id
@@ -152,16 +152,16 @@ CREATE TABLE civicrm_payment_instrument (
         invoice_id
       , domain_id
   )
-  
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-,      INDEX FKEY_contact_id ( contact_id ) ,  
+,      INDEX FKEY_contact_id ( contact_id ) ,
      FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id)
-,      INDEX FKEY_contribution_type_id ( contribution_type_id ) ,  
+,      INDEX FKEY_contribution_type_id ( contribution_type_id ) ,
      FOREIGN KEY (contribution_type_id) REFERENCES civicrm_contribution_type(id)
-,      INDEX FKEY_payment_instrument_id ( payment_instrument_id ) ,  
+,      INDEX FKEY_payment_instrument_id ( payment_instrument_id ) ,
      FOREIGN KEY (payment_instrument_id) REFERENCES civicrm_payment_instrument(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -194,40 +194,40 @@ CREATE TABLE civicrm_payment_instrument (
      cc_receipt varchar(255)    COMMENT 'comma-separated list of email addresses to cc each time a receipt is sent',
      bcc_receipt varchar(255)    COMMENT 'comma-separated list of email addresses to bcc each time a receipt is sent',
      receipt_text text    COMMENT 'text to include above standard receipt info on receipt email; emails are text-only, so do not allow html for now',
-     is_active tinyint    COMMENT 'Is this property active?' 
+     is_active tinyint    COMMENT 'Is this property active?'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-,      INDEX FKEY_contribution_type_id ( contribution_type_id ) ,  
+,      INDEX FKEY_contribution_type_id ( contribution_type_id ) ,
      FOREIGN KEY (contribution_type_id) REFERENCES civicrm_contribution_type(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
 -- *
 -- * civicrm_dupe_match
 -- *
--- * 
+-- *
 -- *
 -- *******************************************************/
-  
+
 CREATE TABLE civicrm_dupe_match (
 
 
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'Unique DupeMatch ID',
      domain_id int unsigned NOT NULL   COMMENT 'Which Domain owns this contact',
      entity_table varchar(64) NOT NULL   COMMENT 'Name Of Entity Table',
-     rule varchar(255) NOT NULL   COMMENT 'String that can Contains valid civicrm core or custom field name,parenthesis,,AND,OR ' 
+     rule varchar(255) NOT NULL   COMMENT 'String that can Contains valid civicrm core or custom field name,parenthesis,,AND,OR '
 ,
     PRIMARY KEY ( id )
- 
- 
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -235,10 +235,10 @@ CREATE TABLE civicrm_dupe_match (
 -- *
 -- * civicrm_financial_trxn
 -- *
--- * 
+-- *
 -- *
 -- *******************************************************/
-  
+
    CREATE TABLE civicrm_financial_trxn (
 
 
@@ -254,10 +254,10 @@ CREATE TABLE civicrm_dupe_match (
      currency varchar(64) NOT NULL   COMMENT '3 character string, value derived from payment processor config setting.',
      payment_processor varchar(64) NOT NULL   COMMENT 'derived from Processor setting in civicrm.settings.php.',
      trxn_id varchar(255) NOT NULL   COMMENT 'unique processor transaction id, bank id + trans id,... depending on payment_method',
-     trxn_result_code varchar(255)    COMMENT 'processor result code' 
+     trxn_result_code varchar(255)    COMMENT 'processor result code'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_entity(
         entity_table
       , entity_id
@@ -266,10 +266,10 @@ CREATE TABLE civicrm_dupe_match (
         trxn_id
       , domain_id
   )
-  
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -278,7 +278,7 @@ CREATE TABLE civicrm_dupe_match (
 -- *
 -- * civicrm_module_profile
 -- *
--- * 
+-- *
 -- *
 -- *******************************************************/
 
@@ -291,28 +291,28 @@ CREATE TABLE civicrm_dupe_match (
      entity_table varchar(64)    COMMENT 'physical tablename for entity being extended by this data, e.g. civicrm_contact',
      entity_id int unsigned NOT NULL   COMMENT 'FK to record in the entity table specified by entity_table column.',
      uf_group_id int unsigned NOT NULL   COMMENT 'Which form does this field belong to.',
-     weight int NOT NULL  DEFAULT 1 COMMENT 'each internal or external module uses this to order multiple profiles associated with an entity_id' 
+     weight int NOT NULL  DEFAULT 1 COMMENT 'each internal or external module uses this to order multiple profiles associated with an entity_id'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_entity(
         entity_table
       , entity_id
   )
-  
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-,      INDEX FKEY_uf_group_id ( uf_group_id ) ,  
+,      INDEX FKEY_uf_group_id ( uf_group_id ) ,
      FOREIGN KEY (uf_group_id) REFERENCES civicrm_uf_group(id)
-  
+
 )  TYPE=InnoDB  ;
-  
+
 
 -- /*******************************************************
 -- *
 -- * civicrm_uf_join
 -- *
--- * 
+-- *
 -- *
 -- *******************************************************/
 
@@ -325,19 +325,19 @@ CREATE TABLE civicrm_dupe_match (
      entity_table varchar(64)    COMMENT 'Name of table where item being referenced is stored. Modules which only need a single collection of uf_join instances may choose not to populate entity_table and entity_id.',
      entity_id int unsigned    COMMENT 'Foreign key to the referenced item.',
      weight int NOT NULL  DEFAULT 1 COMMENT 'Controls display order when multiple user framework groups are setup for concurrent display.',
-     uf_group_id int unsigned NOT NULL   COMMENT 'Which form does this field belong to.' 
+     uf_group_id int unsigned NOT NULL   COMMENT 'Which form does this field belong to.'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_entity(
         entity_table
       , entity_id
   )
-  
-,      INDEX FKEY_uf_group_id ( uf_group_id ) ,  
+
+,      INDEX FKEY_uf_group_id ( uf_group_id ) ,
      FOREIGN KEY (uf_group_id) REFERENCES civicrm_uf_group(id)
-  
-)  TYPE=InnoDB  ;    
+
+)  TYPE=InnoDB  ;
 
 
 -- /*******************************************************
@@ -348,12 +348,12 @@ CREATE TABLE civicrm_dupe_match (
 
    INSERT INTO `civicrm_contribution_type` VALUES (1, 1, 'Donation', NULL, NULL, 1, 0, 1);
    INSERT INTO `civicrm_contribution_type` VALUES (2, 1, 'Member Dues', NULL, NULL, 1, 0, 1);
-   INSERT INTO `civicrm_contribution_type` VALUES (3, 1, 'Campaign Contribution', NULL, NULL, 0, 0, 1);   
+   INSERT INTO `civicrm_contribution_type` VALUES (3, 1, 'Campaign Contribution', NULL, NULL, 0, 0, 1);
 
    INSERT INTO `civicrm_payment_instrument` VALUES (1, 1, 'Credit Card', NULL, 1, 1);
    INSERT INTO `civicrm_payment_instrument` VALUES (2, 1, 'Debit Card', NULL, 1, 1);
    INSERT INTO `civicrm_payment_instrument` VALUES (3, 1, 'Cash', NULL, 1, 1);
-   INSERT INTO `civicrm_payment_instrument` VALUES (4, 1, 'Check', NULL, 1, 1); 
+   INSERT INTO `civicrm_payment_instrument` VALUES (4, 1, 'Check', NULL, 1, 1);
    INSERT INTO `civicrm_payment_instrument` VALUES (5, 1, 'EFT', NULL, 1, 1);
 
    INSERT INTO `civicrm_dupe_match` VALUES (1, 1, 'contact_individual', 'first_name AND last_name AND email');
@@ -364,7 +364,7 @@ CREATE TABLE civicrm_dupe_match (
 -- * Modify the civicrm_uf_group  Table Structure
 -- *
 -- *******************************************************/
-  
+
     ALTER TABLE `civicrm_uf_group` DROP `weight` ;
 
 
@@ -376,14 +376,14 @@ CREATE TABLE civicrm_dupe_match (
 
    ALTER TABLE `civicrm_uf_field` DROP `is_registration` ,
                                   DROP `is_match` ;
-   
+
    ALTER TABLE `civicrm_uf_field` ADD `location_type_id` INT UNSIGNED COMMENT 'Location type of this mapping, if required';
-   ALTER TABLE `civicrm_uf_field` ADD INDEX (`location_type_id`);  
+   ALTER TABLE `civicrm_uf_field` ADD INDEX (`location_type_id`);
    ALTER TABLE `civicrm_uf_field` ADD FOREIGN KEY (`location_type_id`) REFERENCES `civicrm_location_type` (`id`);
 
    ALTER TABLE `civicrm_uf_field` ADD `phone_type` VARCHAR( 64 )   COMMENT 'Phone type, if required';
- 
-   
+
+
 
 -- /*******************************************************
 -- *
@@ -391,11 +391,11 @@ CREATE TABLE civicrm_dupe_match (
 -- *
 -- *******************************************************/
 
-   
+
     ALTER TABLE `civicrm_custom_option` ADD `entity_table` VARCHAR( 64 )  COMMENT 'Name of table where item being referenced is stored.' ;
     UPDATE `civicrm_custom_option` SET `entity_table` = 'civicrm_custom_field' ;
 
-    ALTER TABLE `civicrm_custom_option` ADD `entity_id`  INT( 10 ) UNSIGNED DEFAULT '0' NOT NULL; 
+    ALTER TABLE `civicrm_custom_option` ADD `entity_id`  INT( 10 ) UNSIGNED DEFAULT '0' NOT NULL;
     UPDATE `civicrm_custom_option` SET entity_id = custom_field_id;
 
     ALTER TABLE `civicrm_custom_option` DROP KEY `UI_label_custom_field_id`;
@@ -431,7 +431,7 @@ CREATE TABLE civicrm_dupe_match (
 -- * Modify the  civicrm_custom_field Table Structure
 -- *
 -- *******************************************************/
-   
+
    ALTER TABLE `civicrm_custom_field` CHANGE `html_type` `html_type` ENUM( 'Text', 'TextArea', 'Select', 'Multi-Select', 'Radio', 'CheckBox', 'Select Date', 'Select State/Province', 'Select Country' ) DEFAULT NULL COMMENT 'HTML types plus several built-in extended types.';
 
 
@@ -440,7 +440,7 @@ CREATE TABLE civicrm_dupe_match (
 -- * Drop Old Tables
 -- *
 -- *******************************************************/
- 
+
    DROP TABLE IF EXISTS civicrm_donation_page;
 
 
diff --git a/sql/civicrm_upgradedb_v1.2_v1.3_41.mysql b/sql/civicrm_upgradedb_v1.2_v1.3_41.mysql
index a7a0fd1120..dbe08f067f 100644
--- a/sql/civicrm_upgradedb_v1.2_v1.3_41.mysql
+++ b/sql/civicrm_upgradedb_v1.2_v1.3_41.mysql
@@ -42,14 +42,14 @@ CREATE TABLE civicrm_accept_credit_card (
      name varchar(64)    COMMENT ' Credit Card Type as defined by the payment processor.',
      title varchar(64)    COMMENT 'Descriptive Credit Card Name.',
      is_reserved tinyint    COMMENT 'Is this a predefined system object?',
-     is_active tinyint    COMMENT 'Is this property active?' 
+     is_active tinyint    COMMENT 'Is this property active?'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      
+
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -71,25 +71,25 @@ CREATE TABLE civicrm_contribution_type (
      description varchar(255)    COMMENT 'Contribution Type Description.',
      is_deductible tinyint   DEFAULT 1 COMMENT 'Is this contribution type tax-deductible? If true, contributions of this type may be fully OR partially deductible - non-deductible amount is stored in the Contribution record.',
      is_reserved tinyint    COMMENT 'Is this a predefined system object?',
-     is_active tinyint    COMMENT 'Is this property active?' 
+     is_active tinyint    COMMENT 'Is this property active?'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     UNIQUE INDEX UI_name_domain_id(
         name
       , domain_id
   )
-  
-,      
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
 -- *
 -- * civicrm_payment_instrument
 -- *
--- * 
+-- *
 -- *
 -- *******************************************************/
 
@@ -101,18 +101,18 @@ CREATE TABLE civicrm_payment_instrument (
      name varchar(64)    COMMENT ' Payment Instrument Name.',
      description varchar(255)    COMMENT ' Payment Instrument Description.',
      is_reserved tinyint    COMMENT 'Is this a predefined system object?',
-     is_active tinyint    COMMENT 'Is this property active?' 
+     is_active tinyint    COMMENT 'Is this property active?'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     UNIQUE INDEX UI_name_domain_id(
         name
       , domain_id
   )
-  
-,      
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -123,7 +123,7 @@ CREATE TABLE civicrm_payment_instrument (
 -- *
 -- *
 -- *******************************************************/
-   
+
 CREATE TABLE civicrm_contribution (
 
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'Contribution ID',
@@ -143,10 +143,10 @@ CREATE TABLE civicrm_contribution (
      cancel_reason text    ,
      receipt_date datetime    COMMENT 'when (if) receipt was sent; populated automatically for online donations w/ automatic receipting',
      thankyou_date datetime    COMMENT 'when (if) was donor thanked',
-     source varchar(255)    COMMENT 'Origin of this Contribution.' 
+     source varchar(255)    COMMENT 'Origin of this Contribution.'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     UNIQUE INDEX UI_contrib_trxn_id_domain_id(
         trxn_id
       , domain_id
@@ -155,17 +155,17 @@ CREATE TABLE civicrm_contribution (
         invoice_id
       , domain_id
   )
-  
-  
-,      
+
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-,      
+,
      FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id)
-,      
+,
      FOREIGN KEY (contribution_type_id) REFERENCES civicrm_contribution_type(id)
-,      
+,
      FOREIGN KEY (payment_instrument_id) REFERENCES civicrm_payment_instrument(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -197,19 +197,19 @@ CREATE TABLE civicrm_contribution (
      cc_receipt varchar(255)    COMMENT 'comma-separated list of email addresses to cc each time a receipt is sent',
      bcc_receipt varchar(255)    COMMENT 'comma-separated list of email addresses to bcc each time a receipt is sent',
      receipt_text text    COMMENT 'text to include above standard receipt info on receipt email; emails are text-only, so do not allow html for now',
-     is_active tinyint    COMMENT 'Is this property active?' 
+     is_active tinyint    COMMENT 'Is this property active?'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      
+
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-,      
+,
      FOREIGN KEY (contribution_type_id) REFERENCES civicrm_contribution_type(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
- 
+
 
 
 
@@ -217,7 +217,7 @@ CREATE TABLE civicrm_contribution (
 -- *
 -- * civicrm_dupe_match
 -- *
--- * 
+-- *
 -- *
 -- *******************************************************/
   CREATE TABLE civicrm_dupe_match (
@@ -226,26 +226,26 @@ CREATE TABLE civicrm_contribution (
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'Unique DupeMatch ID',
      domain_id int unsigned NOT NULL   COMMENT 'Which Domain owns this contact',
      entity_table varchar(64) NOT NULL   COMMENT 'Name Of Entity Table',
-     rule varchar(255) NOT NULL   COMMENT 'String that can Contains valid civicrm core or custom field name,parenthesis,,AND,OR ' 
+     rule varchar(255) NOT NULL   COMMENT 'String that can Contains valid civicrm core or custom field name,parenthesis,,AND,OR '
 ,
     PRIMARY KEY ( id )
- 
- 
-,      
+
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
-  
+
 
 
 -- /*******************************************************
 -- *
 -- * civicrm_financial_trxn
 -- *
--- * 
+-- *
 -- *
 -- *******************************************************/
-  
+
   CREATE TABLE civicrm_financial_trxn (
 
 
@@ -261,10 +261,10 @@ CREATE TABLE civicrm_contribution (
      currency varchar(64) NOT NULL   COMMENT '3 character string, value derived from payment processor config setting.',
      payment_processor varchar(64) NOT NULL   COMMENT 'derived from Processor setting in civicrm.settings.php.',
      trxn_id varchar(255) NOT NULL   COMMENT 'unique processor transaction id, bank id + trans id,... depending on payment_method',
-     trxn_result_code varchar(255)    COMMENT 'processor result code' 
+     trxn_result_code varchar(255)    COMMENT 'processor result code'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_entity(
         entity_table
       , entity_id
@@ -273,10 +273,10 @@ CREATE TABLE civicrm_contribution (
         trxn_id
       , domain_id
   )
-  
-,      
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -284,7 +284,7 @@ CREATE TABLE civicrm_contribution (
 -- *
 -- * civicrm_module_profile
 -- *
--- * 
+-- *
 -- *
 -- *******************************************************/
 
@@ -297,31 +297,31 @@ CREATE TABLE civicrm_contribution (
      entity_table varchar(64)    COMMENT 'physical tablename for entity being extended by this data, e.g. civicrm_contact',
      entity_id int unsigned NOT NULL   COMMENT 'FK to record in the entity table specified by entity_table column.',
      uf_group_id int unsigned NOT NULL   COMMENT 'Which form does this field belong to.',
-     weight int NOT NULL  DEFAULT 1 COMMENT 'each internal or external module uses this to order multiple profiles associated with an entity_id' 
+     weight int NOT NULL  DEFAULT 1 COMMENT 'each internal or external module uses this to order multiple profiles associated with an entity_id'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_entity(
         entity_table
       , entity_id
   )
-  
-,      
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-,      
+,
      FOREIGN KEY (uf_group_id) REFERENCES civicrm_uf_group(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
-  
+
 
 -- /*******************************************************
 -- *
 -- * civicrm_uf_join
 -- *
--- * 
+-- *
 -- *
 -- *******************************************************/
- 
+
     CREATE TABLE civicrm_uf_join (
 
 
@@ -331,18 +331,18 @@ CREATE TABLE civicrm_contribution (
      entity_table varchar(64)    COMMENT 'Name of table where item being referenced is stored. Modules which only need a single collection of uf_join instances may choose not to populate entity_table and entity_id.',
      entity_id int unsigned    COMMENT 'Foreign key to the referenced item.',
      weight int NOT NULL  DEFAULT 1 COMMENT 'Controls display order when multiple user framework groups are setup for concurrent display.',
-     uf_group_id int unsigned NOT NULL   COMMENT 'Which form does this field belong to.' 
+     uf_group_id int unsigned NOT NULL   COMMENT 'Which form does this field belong to.'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_entity(
         entity_table
       , entity_id
   )
-  
-,      
+
+,
      FOREIGN KEY (uf_group_id) REFERENCES civicrm_uf_group(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -356,16 +356,16 @@ CREATE TABLE civicrm_contribution (
 
    INSERT INTO `civicrm_contribution_type` VALUES (1, 1, 'Donation', NULL, NULL, 1, 0, 1);
    INSERT INTO `civicrm_contribution_type` VALUES (2, 1, 'Member Dues', NULL, NULL, 1, 0, 1);
-   INSERT INTO `civicrm_contribution_type` VALUES (3, 1, 'Campaign Contribution', NULL, NULL, 0, 0, 1);   
+   INSERT INTO `civicrm_contribution_type` VALUES (3, 1, 'Campaign Contribution', NULL, NULL, 0, 0, 1);
 
    INSERT INTO `civicrm_payment_instrument` VALUES (1, 1, 'Credit Card', NULL, 1, 1);
    INSERT INTO `civicrm_payment_instrument` VALUES (2, 1, 'Debit Card', NULL, 1, 1);
    INSERT INTO `civicrm_payment_instrument` VALUES (3, 1, 'Cash', NULL, 1, 1);
-   INSERT INTO `civicrm_payment_instrument` VALUES (4, 1, 'Check', NULL, 1, 1); 
+   INSERT INTO `civicrm_payment_instrument` VALUES (4, 1, 'Check', NULL, 1, 1);
    INSERT INTO `civicrm_payment_instrument` VALUES (5, 1, 'EFT', NULL, 1, 1);
 
    INSERT INTO `civicrm_dupe_match` VALUES (1, 1, 'contact_individual', 'first_name AND last_name AND email');
-   
+
 
 
 -- /*******************************************************
@@ -373,7 +373,7 @@ CREATE TABLE civicrm_contribution (
 -- * Modify the civicrm_uf_group  Table Structure
 -- *
 -- *******************************************************/
-  
+
     ALTER TABLE `civicrm_uf_group` DROP `weight` ;
 
 
@@ -385,13 +385,13 @@ CREATE TABLE civicrm_contribution (
 
    ALTER TABLE `civicrm_uf_field` DROP `is_registration` ,
                                   DROP `is_match` ;
-   
+
    ALTER TABLE `civicrm_uf_field` ADD `location_type_id` INT UNSIGNED COMMENT 'Location type of this mapping, if required';
    ALTER TABLE `civicrm_uf_field` ADD FOREIGN KEY (`location_type_id`) REFERENCES `civicrm_location_type` (`id`);
 
    ALTER TABLE `civicrm_uf_field` ADD `phone_type` VARCHAR( 64 )   COMMENT 'Phone type, if required';
- 
-   
+
+
 
 -- /*******************************************************
 -- *
@@ -402,7 +402,7 @@ CREATE TABLE civicrm_contribution (
     ALTER TABLE `civicrm_custom_option` ADD `entity_table` VARCHAR( 64 )  COMMENT 'Name of table where item being referenced is stored.' ;
     UPDATE `civicrm_custom_option` SET `entity_table` = 'civicrm_custom_field' ;
 
-    ALTER TABLE `civicrm_custom_option` ADD `entity_id`  INT( 10 ) UNSIGNED DEFAULT '0' NOT NULL; 
+    ALTER TABLE `civicrm_custom_option` ADD `entity_id`  INT( 10 ) UNSIGNED DEFAULT '0' NOT NULL;
     UPDATE `civicrm_custom_option` SET entity_id = custom_field_id;
 
     ALTER TABLE `civicrm_custom_option` DROP KEY `UI_label_custom_field_id`;
@@ -441,7 +441,7 @@ CREATE TABLE civicrm_contribution (
 -- * Modify the  civicrm_custom_field Table Structure
 -- *
 -- *******************************************************/
-   
+
    ALTER TABLE `civicrm_custom_field` CHANGE `html_type` `html_type` ENUM( 'Text', 'TextArea', 'Select', 'Multi-Select', 'Radio', 'CheckBox', 'Select Date', 'Select State/Province', 'Select Country' ) DEFAULT NULL COMMENT 'HTML types plus several built-in extended types.';
 
 
@@ -451,7 +451,7 @@ CREATE TABLE civicrm_contribution (
 -- * Drop Old Tables
 -- *
 -- *******************************************************/
- 
+
    DROP TABLE IF EXISTS civicrm_donation_page;
 
 
diff --git a/sql/civicrm_upgradedb_v1.3_v1.4_40.mysql b/sql/civicrm_upgradedb_v1.3_v1.4_40.mysql
index 688036037f..bef95b8d82 100644
--- a/sql/civicrm_upgradedb_v1.3_v1.4_40.mysql
+++ b/sql/civicrm_upgradedb_v1.3_v1.4_40.mysql
@@ -54,13 +54,13 @@ CREATE TABLE civicrm_contribution_product (
      fulfilled_date date    COMMENT 'Optional. Can be used to record the date this product was fulfilled or shipped.',
      start_date date    COMMENT 'Actual start date for a time-delimited premium (subscription, service or membership)',
      end_date date    COMMENT 'Actual end date for a time-delimited premium (subscription, service or membership)',
-     comment text     
+     comment text
 ,
     PRIMARY KEY ( id )
- 
-,      INDEX FKEY_contribution_id ( contribution_id ) ,  
+
+,      INDEX FKEY_contribution_id ( contribution_id ) ,
      FOREIGN KEY (contribution_id) REFERENCES civicrm_contribution(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -86,13 +86,13 @@ CREATE TABLE civicrm_contribution_recur (
      failure_count int unsigned   DEFAULT 0 COMMENT 'Number of failed charge attempts since last success. Business rule could be set to deactivate on more than x failures.',
      failure_retry_date date    COMMENT 'At Groundspring we set a business rule to retry failed payments every 7 days - and stored the next scheduled attempt date there.',
      processor_id varchar(255)    COMMENT 'Possibly needed to store a unique identifier for this recurring payment order - if this is available from the processor??',
-     auto_renew tinyint NOT NULL  DEFAULT 0 COMMENT 'Some systems allow contributor to set a number of installments - but then auto-renew the subscription or commitment if they do not cancel.' 
+     auto_renew tinyint NOT NULL  DEFAULT 0 COMMENT 'Some systems allow contributor to set a number of installments - but then auto-renew the subscription or commitment if they do not cancel.'
 ,
     PRIMARY KEY ( id )
 
-,      INDEX FKEY_contact_id ( contact_id ) ,  
+,      INDEX FKEY_contact_id ( contact_id ) ,
      FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -100,7 +100,7 @@ CREATE TABLE civicrm_contribution_recur (
 -- *
 -- * civicrm_premiums
 -- *
--- * table - settings for the Premiums features for a given contribution page 
+-- * table - settings for the Premiums features for a given contribution page
 -- *
 -- *******************************************************/
 CREATE TABLE civicrm_premiums (
@@ -112,17 +112,17 @@ CREATE TABLE civicrm_premiums (
      premiums_intro_text text    COMMENT 'Displayed in <div > at top of Premiums section of page. Text and html allowed.',
      premiums_contact_email varchar(100)    COMMENT 'This email address is included in receipts if it is populated and a premium has been selected.',
      premiums_contact_phone varchar(50)    COMMENT 'This phone number is included in receipts if it is populated and a premium has been selected.',
-     premiums_display_min_contribution tinyint NOT NULL   COMMENT 'Boolean. Should we automatically display minimum contribution amount text after the premium descriptions.' 
+     premiums_display_min_contribution tinyint NOT NULL   COMMENT 'Boolean. Should we automatically display minimum contribution amount text after the premium descriptions.'
 ,
     PRIMARY KEY ( id )
- 
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
 -- *
 -- * civicrm_product
 -- *
--- * able - stores "product info" for premiums and can be used for non-incentive products 
+-- * able - stores "product info" for premiums and can be used for non-incentive products
 -- *
 -- *******************************************************/
 CREATE TABLE civicrm_product (
@@ -144,13 +144,13 @@ CREATE TABLE civicrm_product (
      duration_unit enum('day', 'month', 'week', 'year')   DEFAULT 'year' ,
      duration_interval int    COMMENT 'Number of units for total duration of subscription, service, membership (e.g. 12 Months).',
      frequency_unit enum('day', 'month', 'week', 'year')   DEFAULT 'month' COMMENT 'Frequency unit and interval allow option to store actual delivery frequency for a subscription or service.',
-     frequency_interval int    COMMENT 'Number of units for delivery frequency of subscription, service, membership (e.g. every 3 Months).' 
+     frequency_interval int    COMMENT 'Number of units for delivery frequency of subscription, service, membership (e.g. every 3 Months).'
 ,
     PRIMARY KEY ( id )
- 
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -164,15 +164,15 @@ CREATE TABLE civicrm_premiums_product (
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'Contribution ID',
      premiums_id int unsigned NOT NULL   COMMENT 'Foreign key to premiums settings record.',
      product_id int unsigned NOT NULL   COMMENT 'Foreign key to each product object.',
-     sort_position int unsigned NOT NULL    
+     sort_position int unsigned NOT NULL
 ,
     PRIMARY KEY ( id )
- 
-,      INDEX FKEY_premiums_id ( premiums_id ) ,  
+
+,      INDEX FKEY_premiums_id ( premiums_id ) ,
      FOREIGN KEY (premiums_id) REFERENCES civicrm_premiums(id)
-,      INDEX FKEY_product_id ( product_id ) ,  
+,      INDEX FKEY_product_id ( product_id ) ,
      FOREIGN KEY (product_id) REFERENCES civicrm_product(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -188,13 +188,13 @@ CREATE TABLE civicrm_sms_history (
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'SMS History ID',
      message text    COMMENT 'Contents of the SMS.',
      contact_id int unsigned NOT NULL   COMMENT 'FK to Contact who is sending this SMS',
-     sent_date date    COMMENT 'When was this SMS sent' 
+     sent_date date    COMMENT 'When was this SMS sent'
 ,
     PRIMARY KEY ( id )
 
-,      INDEX FKEY_contact_id ( contact_id ) ,  
+,      INDEX FKEY_contact_id ( contact_id ) ,
      FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -212,17 +212,17 @@ CREATE TABLE civicrm_sms_history (
 -- * Modify the civicrm_contribution  Table Structure
 -- *
 -- *******************************************************/
-  
+
    ALTER TABLE `civicrm_contribution` ADD `solicitor_id` int unsigned COMMENT 'FK to Solicitor ID';
-   
+
    ALTER TABLE `civicrm_contribution` ADD INDEX (`solicitor_id`);
 
    ALTER TABLE `civicrm_contribution` ADD FOREIGN KEY (`solicitor_id`) REFERENCES `civicrm_contact` (`id`);
 
    ALTER TABLE `civicrm_contribution` ADD note text    COMMENT 'Note and/or Comment.';
 
-   ALTER TABLE `civicrm_contribution` ADD recur_contribution_id int unsigned    COMMENT 'Conditional foreign key to civicrm_contribution_recur id. Each contribution made in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.'; 
-  
+   ALTER TABLE `civicrm_contribution` ADD recur_contribution_id int unsigned    COMMENT 'Conditional foreign key to civicrm_contribution_recur id. Each contribution made in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.';
+
    ALTER TABLE `civicrm_contribution` ADD INDEX (`recur_contribution_id`);
 
    ALTER TABLE `civicrm_contribution` ADD CONSTRAINT FOREIGN KEY (recur_contribution_id) REFERENCES civicrm_contribution_recur(id);
@@ -234,7 +234,7 @@ CREATE TABLE civicrm_sms_history (
 -- *
 -- *******************************************************/
 
-   ALTER TABLE `civicrm_contribution_page` ADD footer_text text    COMMENT 'Text and html allowed. Displayed at the bottom of the first page of the contribution wizard.'; 
+   ALTER TABLE `civicrm_contribution_page` ADD footer_text text    COMMENT 'Text and html allowed. Displayed at the bottom of the first page of the contribution wizard.';
 
 
 -- /*******************************************************
@@ -242,13 +242,13 @@ CREATE TABLE civicrm_sms_history (
 -- * Modify the civicrm_custom_field Table Structure
 -- *
 -- *******************************************************/
-   
+
    ALTER TABLE `civicrm_custom_field` ADD is_search_range tinyint   DEFAULT 0 COMMENT 'Is this property range searchable.';
    ALTER TABLE `civicrm_custom_field` ADD start_date_years int unsigned    COMMENT 'Date may be up to start_date_years years prior to tcurrent date  ';
    ALTER TABLE `civicrm_custom_field` ADD end_date_years int unsigned    COMMENT 'Date may be up to end_date_years years after to tcurrent date ';
    ALTER TABLE `civicrm_custom_field` ADD date_parts varchar(255)    COMMENT 'which date part included in display ';
    ALTER TABLE `civicrm_custom_field` ADD note_columns int unsigned    COMMENT ' Number of columns in Note Field ';
-   ALTER TABLE `civicrm_custom_field` ADD note_rows int unsigned    COMMENT ' Number of rows in Note Field '; 
+   ALTER TABLE `civicrm_custom_field` ADD note_rows int unsigned    COMMENT ' Number of rows in Note Field ';
 
 
 -- /*******************************************************
@@ -268,7 +268,7 @@ CREATE TABLE civicrm_sms_history (
 
    ALTER TABLE `civicrm_location` ADD  name varchar(255);
 
-  
+
 -- /*******************************************************
 -- *
 -- * Modify the civicrm_uf_field  Table Structure
@@ -280,19 +280,19 @@ CREATE TABLE civicrm_sms_history (
    ALTER TABLE `civicrm_uf_field` ADD label varchar(255)    COMMENT 'To save label for fields.';
 
    ALTER TABLE `civicrm_uf_field` ADD field_type varchar(255)    COMMENT 'This field saves field type (ie individual,household.. field etc).';
- 
+
 
 -- /*******************************************************
 -- *
 -- * Modify the civicrm_uf_group  Table Structure
 -- *
 -- *******************************************************/
-   
+
    ALTER TABLE `civicrm_uf_group` ADD limit_listings_group_id int unsigned    COMMENT 'Group id, foriegn key from civicrm_group';
 
-   ALTER TABLE `civicrm_uf_group` ADD INDEX (`limit_listings_group_id`);    
+   ALTER TABLE `civicrm_uf_group` ADD INDEX (`limit_listings_group_id`);
 
-   ALTER TABLE `civicrm_uf_group` ADD FOREIGN KEY (limit_listings_group_id) REFERENCES civicrm_group(id);  
+   ALTER TABLE `civicrm_uf_group` ADD FOREIGN KEY (limit_listings_group_id) REFERENCES civicrm_group(id);
 
    ALTER TABLE `civicrm_uf_group` ADD post_URL varchar(255)    COMMENT 'Redirect to URL.';
 
@@ -313,7 +313,7 @@ CREATE TABLE civicrm_sms_history (
 -- * Drop Old Tables
 -- *
 -- *******************************************************/
- 
+
    DROP TABLE IF EXISTS civicrm_module_profile;
 
 
diff --git a/sql/civicrm_upgradedb_v1.3_v1.4_41.mysql b/sql/civicrm_upgradedb_v1.3_v1.4_41.mysql
index 3f86d69ae1..67d9cc01f7 100644
--- a/sql/civicrm_upgradedb_v1.3_v1.4_41.mysql
+++ b/sql/civicrm_upgradedb_v1.3_v1.4_41.mysql
@@ -54,12 +54,12 @@ CREATE TABLE civicrm_contribution_product (
      fulfilled_date date    COMMENT 'Optional. Can be used to record the date this product was fulfilled or shipped.',
      start_date date    COMMENT 'Actual start date for a time-delimited premium (subscription, service or membership)',
      end_date date    COMMENT 'Actual end date for a time-delimited premium (subscription, service or membership)',
-     comment text     
+     comment text
 ,
     PRIMARY KEY ( id )
-,      
+,
      FOREIGN KEY (contribution_id) REFERENCES civicrm_contribution(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -85,12 +85,12 @@ CREATE TABLE civicrm_contribution_recur (
      failure_count int unsigned   DEFAULT 0 COMMENT 'Number of failed charge attempts since last success. Business rule could be set to deactivate on more than x failures.',
      failure_retry_date date    COMMENT 'At Groundspring we set a business rule to retry failed payments every 7 days - and stored the next scheduled attempt date there.',
      processor_id varchar(255)    COMMENT 'Possibly needed to store a unique identifier for this recurring payment order - if this is available from the processor??',
-     auto_renew tinyint NOT NULL  DEFAULT 0 COMMENT 'Some systems allow contributor to set a number of installments - but then auto-renew the subscription or commitment if they do not cancel.' 
+     auto_renew tinyint NOT NULL  DEFAULT 0 COMMENT 'Some systems allow contributor to set a number of installments - but then auto-renew the subscription or commitment if they do not cancel.'
 ,
     PRIMARY KEY ( id )
-,      
+,
      FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -98,7 +98,7 @@ CREATE TABLE civicrm_contribution_recur (
 -- *
 -- * civicrm_premiums
 -- *
--- * table - settings for the Premiums features for a given contribution page 
+-- * table - settings for the Premiums features for a given contribution page
 -- *
 -- *******************************************************/
 CREATE TABLE civicrm_premiums (
@@ -110,10 +110,10 @@ CREATE TABLE civicrm_premiums (
      premiums_intro_text text    COMMENT 'Displayed in <div > at top of Premiums section of page. Text and html allowed.',
      premiums_contact_email varchar(100)    COMMENT 'This email address is included in receipts if it is populated and a premium has been selected.',
      premiums_contact_phone varchar(50)    COMMENT 'This phone number is included in receipts if it is populated and a premium has been selected.',
-     premiums_display_min_contribution tinyint NOT NULL   COMMENT 'Boolean. Should we automatically display minimum contribution amount text after the premium descriptions.' 
+     premiums_display_min_contribution tinyint NOT NULL   COMMENT 'Boolean. Should we automatically display minimum contribution amount text after the premium descriptions.'
 ,
     PRIMARY KEY ( id )
- 
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -121,7 +121,7 @@ CREATE TABLE civicrm_premiums (
 -- *
 -- * civicrm_product
 -- *
--- * able - stores "product info" for premiums and can be used for non-incentive products 
+-- * able - stores "product info" for premiums and can be used for non-incentive products
 -- *
 -- *******************************************************/
 CREATE TABLE civicrm_product (
@@ -143,12 +143,12 @@ CREATE TABLE civicrm_product (
      duration_unit enum('day', 'month', 'week', 'year')   DEFAULT 'year' ,
      duration_interval int    COMMENT 'Number of units for total duration of subscription, service, membership (e.g. 12 Months).',
      frequency_unit enum('day', 'month', 'week', 'year')   DEFAULT 'month' COMMENT 'Frequency unit and interval allow option to store actual delivery frequency for a subscription or service.',
-     frequency_interval int    COMMENT 'Number of units for delivery frequency of subscription, service, membership (e.g. every 3 Months).' 
+     frequency_interval int    COMMENT 'Number of units for delivery frequency of subscription, service, membership (e.g. every 3 Months).'
 ,
     PRIMARY KEY ( id )
-,      
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -163,14 +163,14 @@ CREATE TABLE civicrm_premiums_product (
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'Contribution ID',
      premiums_id int unsigned NOT NULL   COMMENT 'Foreign key to premiums settings record.',
      product_id int unsigned NOT NULL   COMMENT 'Foreign key to each product object.',
-     sort_position int unsigned NOT NULL    
+     sort_position int unsigned NOT NULL
 ,
     PRIMARY KEY ( id )
-,      
+,
      FOREIGN KEY (premiums_id) REFERENCES civicrm_premiums(id)
-,      
+,
      FOREIGN KEY (product_id) REFERENCES civicrm_product(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -185,12 +185,12 @@ CREATE TABLE civicrm_sms_history (
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'SMS History ID',
      message text    COMMENT 'Contents of the SMS.',
      contact_id int unsigned NOT NULL   COMMENT 'FK to Contact who is sending this SMS',
-     sent_date date    COMMENT 'When was this SMS sent' 
+     sent_date date    COMMENT 'When was this SMS sent'
 ,
     PRIMARY KEY ( id )
-,      
+,
      FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -208,15 +208,15 @@ CREATE TABLE civicrm_sms_history (
 -- * Modify the civicrm_contribution  Table Structure
 -- *
 -- *******************************************************/
-  
+
    ALTER TABLE `civicrm_contribution` ADD `solicitor_id` int unsigned COMMENT 'FK to Solicitor ID';
-   
+
    ALTER TABLE `civicrm_contribution` ADD CONSTRAINT FOREIGN KEY (`solicitor_id`) REFERENCES `civicrm_contact` (`id`);
 
    ALTER TABLE `civicrm_contribution` ADD note text    COMMENT 'Note and/or Comment.';
 
-   ALTER TABLE `civicrm_contribution` ADD recur_contribution_id int unsigned    COMMENT 'Conditional foreign key to civicrm_contribution_recur id. Each contribution made in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.'; 
-  
+   ALTER TABLE `civicrm_contribution` ADD recur_contribution_id int unsigned    COMMENT 'Conditional foreign key to civicrm_contribution_recur id. Each contribution made in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.';
+
    ALTER TABLE `civicrm_contribution` ADD CONSTRAINT FOREIGN KEY (recur_contribution_id) REFERENCES civicrm_contribution_recur(id);
 
 
@@ -226,7 +226,7 @@ CREATE TABLE civicrm_sms_history (
 -- *
 -- *******************************************************/
 
-   ALTER TABLE `civicrm_contribution_page` ADD footer_text text    COMMENT 'Text and html allowed. Displayed at the bottom of the first page of the contribution wizard.'; 
+   ALTER TABLE `civicrm_contribution_page` ADD footer_text text    COMMENT 'Text and html allowed. Displayed at the bottom of the first page of the contribution wizard.';
 
 
 -- /*******************************************************
@@ -234,13 +234,13 @@ CREATE TABLE civicrm_sms_history (
 -- * Modify the civicrm_custom_field Table Structure
 -- *
 -- *******************************************************/
-   
+
    ALTER TABLE `civicrm_custom_field` ADD is_search_range tinyint   DEFAULT 0 COMMENT 'Is this property range searchable.';
    ALTER TABLE `civicrm_custom_field` ADD start_date_years int unsigned    COMMENT 'Date may be up to start_date_years years prior to tcurrent date  ';
    ALTER TABLE `civicrm_custom_field` ADD end_date_years int unsigned    COMMENT 'Date may be up to end_date_years years after to tcurrent date ';
    ALTER TABLE `civicrm_custom_field` ADD date_parts varchar(255)    COMMENT 'which date part included in display ';
    ALTER TABLE `civicrm_custom_field` ADD note_columns int unsigned    COMMENT ' Number of columns in Note Field ';
-   ALTER TABLE `civicrm_custom_field` ADD note_rows int unsigned    COMMENT ' Number of rows in Note Field '; 
+   ALTER TABLE `civicrm_custom_field` ADD note_rows int unsigned    COMMENT ' Number of rows in Note Field ';
 
 
 -- /*******************************************************
@@ -260,7 +260,7 @@ CREATE TABLE civicrm_sms_history (
 
    ALTER TABLE `civicrm_location` ADD  name varchar(255);
 
-  
+
 -- /*******************************************************
 -- *
 -- * Modify the civicrm_uf_field  Table Structure
@@ -272,17 +272,17 @@ CREATE TABLE civicrm_sms_history (
    ALTER TABLE `civicrm_uf_field` ADD label varchar(255)    COMMENT 'To save label for fields.';
 
    ALTER TABLE `civicrm_uf_field` ADD field_type varchar(255)    COMMENT 'This field saves field type (ie individual,household.. field etc).';
- 
+
 
 -- /*******************************************************
 -- *
 -- * Modify the civicrm_uf_group  Table Structure
 -- *
 -- *******************************************************/
-   
+
    ALTER TABLE `civicrm_uf_group` ADD limit_listings_group_id int unsigned    COMMENT 'Group id, foriegn key from civicrm_group';
 
-   ALTER TABLE `civicrm_uf_group` ADD CONSTRAINT FOREIGN KEY (limit_listings_group_id) REFERENCES civicrm_group(id);  
+   ALTER TABLE `civicrm_uf_group` ADD CONSTRAINT FOREIGN KEY (limit_listings_group_id) REFERENCES civicrm_group(id);
 
    ALTER TABLE `civicrm_uf_group` ADD post_URL varchar(255)    COMMENT 'Redirect to URL.';
 
@@ -303,7 +303,7 @@ CREATE TABLE civicrm_sms_history (
 -- * Drop Old Tables
 -- *
 -- *******************************************************/
- 
+
    DROP TABLE IF EXISTS civicrm_module_profile;
 
 
diff --git a/sql/civicrm_upgradedb_v1.4_v1.5_40.mysql b/sql/civicrm_upgradedb_v1.4_v1.5_40.mysql
index 25f21035e0..a62516fd77 100644
--- a/sql/civicrm_upgradedb_v1.4_v1.5_40.mysql
+++ b/sql/civicrm_upgradedb_v1.4_v1.5_40.mysql
@@ -47,20 +47,20 @@ CREATE TABLE civicrm_membership_type (
      relationship_type_id int unsigned    COMMENT 'FK to Relationship Type ID',
      visibility varchar(64)    ,
      weight int    ,
-     is_active tinyint   DEFAULT 1 COMMENT 'Is this membership_type enabled' 
+     is_active tinyint   DEFAULT 1 COMMENT 'Is this membership_type enabled'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-,      INDEX FKEY_member_of_contact_id ( member_of_contact_id ) ,  
+,      INDEX FKEY_member_of_contact_id ( member_of_contact_id ) ,
      FOREIGN KEY (member_of_contact_id) REFERENCES civicrm_contact(id)
-,      INDEX FKEY_contribution_type_id ( contribution_type_id ) ,  
+,      INDEX FKEY_contribution_type_id ( contribution_type_id ) ,
      FOREIGN KEY (contribution_type_id) REFERENCES civicrm_contribution_type(id)
-,      INDEX FKEY_relationship_type_id ( relationship_type_id ) ,  
+,      INDEX FKEY_relationship_type_id ( relationship_type_id ) ,
      FOREIGN KEY (relationship_type_id) REFERENCES civicrm_relationship_type(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -86,14 +86,14 @@ CREATE TABLE civicrm_membership_status (
      is_admin tinyint    COMMENT 'Is this status for admin/manual assignment only.',
      weight int    ,
      is_default tinyint    COMMENT 'Assign this status to a membership record if no other status match is found.',
-     is_active tinyint   DEFAULT 1 COMMENT 'Is this membership_status enabled.' 
+     is_active tinyint   DEFAULT 1 COMMENT 'Is this membership_status enabled.'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -114,18 +114,18 @@ CREATE TABLE civicrm_membership (
      end_date date    COMMENT 'Current membership period expire date.',
      source varchar(128)    ,
      status_id int unsigned NOT NULL   COMMENT 'FK to Membership Status',
-     is_override tinyint    COMMENT 'Admin users may set a manual status which overrides the calculated status. When this flag is true, automated status update scripts should NOT modify status for the record.' 
+     is_override tinyint    COMMENT 'Admin users may set a manual status which overrides the calculated status. When this flag is true, automated status update scripts should NOT modify status for the record.'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      INDEX FKEY_contact_id ( contact_id ) ,  
+
+
+,      INDEX FKEY_contact_id ( contact_id ) ,
      FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id)
-,      INDEX FKEY_membership_type_id ( membership_type_id ) ,  
+,      INDEX FKEY_membership_type_id ( membership_type_id ) ,
      FOREIGN KEY (membership_type_id) REFERENCES civicrm_membership_type(id)
-,      INDEX FKEY_status_id ( status_id ) ,  
+,      INDEX FKEY_status_id ( status_id ) ,
      FOREIGN KEY (status_id) REFERENCES civicrm_membership_status(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -151,16 +151,16 @@ CREATE TABLE civicrm_membership_block (
      renewal_title varchar(255)    COMMENT 'Title for renewal',
      renewal_text text    COMMENT 'Text to display for member renewal',
      is_required tinyint   DEFAULT 0 COMMENT 'Is membership sign up optional',
-     is_active tinyint   DEFAULT 1 COMMENT 'Is this membership_block enabled' 
+     is_active tinyint   DEFAULT 1 COMMENT 'Is this membership_block enabled'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      INDEX FKEY_entity_id ( entity_id ) ,  
+
+
+,      INDEX FKEY_entity_id ( entity_id ) ,
      FOREIGN KEY (entity_id) REFERENCES civicrm_contribution_page(id)
-,      INDEX FKEY_membership_type_default ( membership_type_default ) ,  
+,      INDEX FKEY_membership_type_default ( membership_type_default ) ,
      FOREIGN KEY (membership_type_default) REFERENCES civicrm_membership_type(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -179,18 +179,18 @@ CREATE TABLE civicrm_membership_log (
      start_date date    COMMENT 'New membership period start date',
      end_date date    COMMENT 'New membership period expiration date.',
      modified_id int unsigned    COMMENT 'FK to Contact ID of person under whose credentials this data modification was made.',
-     modified_date date    COMMENT 'Date this membership modification action was logged.' 
+     modified_date date    COMMENT 'Date this membership modification action was logged.'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      INDEX FKEY_membership_id ( membership_id ) ,  
+
+
+,      INDEX FKEY_membership_id ( membership_id ) ,
      FOREIGN KEY (membership_id) REFERENCES civicrm_membership(id)
-,      INDEX FKEY_status_id ( status_id ) ,  
+,      INDEX FKEY_status_id ( status_id ) ,
      FOREIGN KEY (status_id) REFERENCES civicrm_membership_status(id)
-,      INDEX FKEY_modified_id ( modified_id ) ,  
+,      INDEX FKEY_modified_id ( modified_id ) ,
      FOREIGN KEY (modified_id) REFERENCES civicrm_contact(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -206,18 +206,18 @@ CREATE TABLE civicrm_membership_payment (
      id int unsigned NOT NULL AUTO_INCREMENT  ,
      membership_id int unsigned NOT NULL   COMMENT 'FK to Membership table',
      payment_entity_table varchar(128)    COMMENT 'Table being referenced for payment entity.',
-     payment_entity_id int unsigned    COMMENT 'FK to table with payment record (expected usage is civicrm_contribution).' 
+     payment_entity_id int unsigned    COMMENT 'FK to table with payment record (expected usage is civicrm_contribution).'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_payment_entity(
         payment_entity_table
       , payment_entity_id
   )
-  
-,      INDEX FKEY_membership_id ( membership_id ) ,  
+
+,      INDEX FKEY_membership_id ( membership_id ) ,
      FOREIGN KEY (membership_id) REFERENCES civicrm_membership(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -233,18 +233,18 @@ CREATE TABLE civicrm_option_group (
      name varchar(64) NOT NULL   COMMENT 'Option group name. Used as selection key by class properties which lookup options in civicrm_option_value.',
      description varchar(255)    COMMENT 'Option group description.',
      is_reserved tinyint    COMMENT 'Is this a predefined system option group (i.e. it can not be deleted)?',
-     is_active tinyint    COMMENT 'Is this option group active?' 
+     is_active tinyint    COMMENT 'Is this option group active?'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     UNIQUE INDEX option_group_name_domain_id(
         name
       , domain_id
   )
-  
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -267,18 +267,18 @@ CREATE TABLE civicrm_option_value (
      description varchar(255)    COMMENT 'Optional description.',
      is_optgroup tinyint   DEFAULT 0 COMMENT 'Is this row simply a display header? Expected usage is to render these as OPTGROUP tags within a SELECT field list of options?',
      is_reserved tinyint   DEFAULT 0 COMMENT 'Is this a predefined system object?',
-     is_active tinyint   DEFAULT 1 COMMENT 'Is this option active?' 
+     is_active tinyint   DEFAULT 1 COMMENT 'Is this option active?'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_option_group_id_value(
         value
       , option_group_id
   )
-  
-,      INDEX FKEY_option_group_id ( option_group_id ) ,  
+
+,      INDEX FKEY_option_group_id ( option_group_id ) ,
      FOREIGN KEY (option_group_id) REFERENCES civicrm_option_group(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -301,21 +301,21 @@ CREATE TABLE civicrm_project (
      start_date datetime    COMMENT 'Project start date.',
      end_date datetime    COMMENT 'Project end date.',
      is_active tinyint    COMMENT 'Is this record active? For Projects: can tasks be created for it, does it appear on project listings, etc.',
-     status_id int unsigned    COMMENT 'Configurable status value (e.g. Planned, Active, Closed...). FK to civicrm_option_value.' 
+     status_id int unsigned    COMMENT 'Configurable status value (e.g. Planned, Active, Closed...). FK to civicrm_option_value.'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     UNIQUE INDEX UI_project_owner(
         id
       , owner_entity_table
       , owner_entity_id
   )
-  
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-,      INDEX FKEY_status_id ( status_id ) ,  
+,      INDEX FKEY_status_id ( status_id ) ,
      FOREIGN KEY (status_id) REFERENCES civicrm_option_value(value)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -340,10 +340,10 @@ CREATE TABLE civicrm_task (
      due_date datetime    COMMENT 'Task due date.',
      priority_id int unsigned    COMMENT 'Configurable priority value (e.g. Critical, High, Medium...). FK to civicrm_option_value.',
      task_class varchar(255)    COMMENT 'Optional key to a process class related to this task (e.g. CRM_Quest_PreApp).',
-     is_active tinyint    COMMENT 'Is this record active? For tasks: can it be assigned, does it appear on open task listings, etc.' 
+     is_active tinyint    COMMENT 'Is this record active? For tasks: can it be assigned, does it appear on open task listings, etc.'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     UNIQUE INDEX UI_task_parent(
         id
       , parent_entity_table
@@ -354,14 +354,14 @@ CREATE TABLE civicrm_task (
       , owner_entity_table
       , owner_entity_id
   )
-  
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-,      INDEX FKEY_task_type_id ( task_type_id ) ,  
+,      INDEX FKEY_task_type_id ( task_type_id ) ,
      FOREIGN KEY (task_type_id) REFERENCES civicrm_option_value(value)
-,      INDEX FKEY_priority_id ( priority_id ) ,  
+,      INDEX FKEY_priority_id ( priority_id ) ,
      FOREIGN KEY (priority_id) REFERENCES civicrm_option_value(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -383,10 +383,10 @@ CREATE TABLE civicrm_task_status (
      status_detail text    COMMENT 'Encoded array of status details used for programmatic progress reporting and tracking.',
      status_id int unsigned    COMMENT 'Configurable status value (e.g. Not Started, In Progress, Completed, Deferred...). FK to civicrm_option_value.',
      create_date datetime    COMMENT 'Date this record was created (date work on task started).',
-     modified_date datetime    COMMENT 'Date-time of last update to this task_status record.' 
+     modified_date datetime    COMMENT 'Date-time of last update to this task_status record.'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_task_status_responsible(
         task_id
       , responsible_entity_table
@@ -397,12 +397,12 @@ CREATE TABLE civicrm_task_status (
       , target_entity_table
       , target_entity_id
   )
-  
-,      INDEX FKEY_task_id ( task_id ) ,  
+
+,      INDEX FKEY_task_id ( task_id ) ,
      FOREIGN KEY (task_id) REFERENCES civicrm_task(id)
-,      INDEX FKEY_status_id ( status_id ) ,  
+,      INDEX FKEY_status_id ( status_id ) ,
      FOREIGN KEY (status_id) REFERENCES civicrm_option_value(value)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -421,18 +421,18 @@ CREATE TABLE civicrm_log (
      entity_id int unsigned NOT NULL   COMMENT 'Foreign key to the referenced item.',
      data text    COMMENT 'Updates does to this object if any.',
      modified_id int unsigned    COMMENT 'FK to Contact ID of person under whose credentials this data modification was made.',
-     modified_date datetime    COMMENT 'When was the referenced entity created or modified or deleted.' 
+     modified_date datetime    COMMENT 'When was the referenced entity created or modified or deleted.'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_entity(
         entity_table
       , entity_id
   )
-  
-,      INDEX FKEY_modified_id ( modified_id ) ,  
+
+,      INDEX FKEY_modified_id ( modified_id ) ,
      FOREIGN KEY (modified_id) REFERENCES civicrm_contact(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -452,14 +452,14 @@ CREATE TABLE civicrm_file (
      uri varchar(255)    COMMENT 'uri of the file on disk',
      document mediumblob    COMMENT 'contents of the document',
      description varchar(255)    COMMENT 'Additional descriptive text regarding this attachment (optional).',
-     upload_date datetime    COMMENT 'Date and time that this attachment was uploaded or written to server.' 
+     upload_date datetime    COMMENT 'Date and time that this attachment was uploaded or written to server.'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      INDEX FKEY_file_type_id ( file_type_id ) ,  
+
+
+,      INDEX FKEY_file_type_id ( file_type_id ) ,
      FOREIGN KEY (file_type_id) REFERENCES civicrm_option_value(value)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -475,10 +475,10 @@ CREATE TABLE civicrm_entity_file (
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'primary key',
      entity_table varchar(64)    COMMENT 'physical tablename for entity being joined to file, e.g. civicrm_contact',
      entity_id int unsigned NOT NULL   COMMENT 'FK to entity table specified in entity_table column.',
-     file_id int unsigned NOT NULL   COMMENT 'FK to civicrm_file' 
+     file_id int unsigned NOT NULL   COMMENT 'FK to civicrm_file'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_entity(
         entity_table
       , entity_id
@@ -488,10 +488,10 @@ CREATE TABLE civicrm_entity_file (
       , entity_id
       , file_id
   )
-  
-,      INDEX FKEY_file_id ( file_id ) ,  
+
+,      INDEX FKEY_file_id ( file_id ) ,
      FOREIGN KEY (file_id) REFERENCES civicrm_file(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -509,7 +509,7 @@ CREATE TABLE civicrm_entity_file (
 -- *******************************************************/
    ALTER TABLE `civicrm_contact` DROP INDEX `index_sort_name`;
     ALTER TABLE `civicrm_contact` DROP `hash`;
-  
+
    ALTER TABLE `civicrm_contact` ADD hash varchar(32) DEFAULT NULL COMMENT 'Key for validating requests related to this contact.';
    ALTER TABLE `civicrm_contact` ADD contact_sub_type varchar(64) DEFAULT NULL COMMENT 'May be used to over-ride contact view and edit templates.';
 
@@ -517,21 +517,21 @@ CREATE TABLE civicrm_entity_file (
 
    ALTER TABLE `civicrm_contact` ADD INDEX index_sort_name_domain(sort_name, domain_id, hash);
 
-   ALTER TABLE `civicrm_contact` ADD INDEX index_hash_domain(hash, domain_id);  
+   ALTER TABLE `civicrm_contact` ADD INDEX index_hash_domain(hash, domain_id);
 
 -- /*******************************************************
 -- *
 -- * fix preferred communication data
 -- *******************************************************/
   SELECT @domain_id := id from civicrm_domain;
-    INSERT INTO 
-    `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`) 
-    VALUES 
+    INSERT INTO
+    `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`)
+    VALUES
     (@domain_id, 'preferred_communication_method', 'Preferred Communication Method'     , 0, 1);
     SELECT @option_group_id_pcm := max(id) from civicrm_option_group where name = 'preferred_communication_method';
 
-    INSERT INTO 
-   `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`) 
+    INSERT INTO
+   `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`)
     VALUES
     (@option_group_id_pcm, 'Phone', 1, NULL, NULL, 0, NULL, 1, NULL, 0, 0, 1),
     (@option_group_id_pcm, 'Email', 2, NULL, NULL, 0, NULL, 2, NULL, 0, 0, 1),
@@ -589,7 +589,7 @@ CREATE TABLE civicrm_entity_file (
   ALTER TABLE `civicrm_custom_value` ADD file_id int(10) unsigned DEFAULT NULL COMMENT 'FK to civicrm_file';
   ALTER TABLE `civicrm_custom_value` ADD INDEX (`file_id`);
   ALTER TABLE `civicrm_custom_value` ADD FOREIGN KEY (`file_id`) REFERENCES `civicrm_file`(`id`);
-  
+
 
 -- /*******************************************************
 -- *
@@ -629,8 +629,8 @@ CREATE TABLE civicrm_entity_file (
 
   ALTER TABLE `civicrm_uf_group` ADD add_to_group_id int unsigned DEFAULT NULL COMMENT 'foreign key to civicrm_group_id';
   ALTER TABLE `civicrm_uf_group` ADD INDEX (`add_to_group_id`);
-  ALTER TABLE `civicrm_uf_group` ADD FOREIGN KEY (`add_to_group_id`) REFERENCES `civicrm_group` (`id`);  
-  
+  ALTER TABLE `civicrm_uf_group` ADD FOREIGN KEY (`add_to_group_id`) REFERENCES `civicrm_group` (`id`);
+
   ALTER TABLE `civicrm_uf_group` ADD add_captcha tinyint DEFAULT 0 COMMENT 'Should a CAPTCHA widget be included this Profile form.';
 
   ALTER TABLE `civicrm_uf_group` ADD cancel_URL varchar(255) DEFAULT NULL COMMENT 'Redirect to URL when Cancle button clik .';
diff --git a/sql/civicrm_upgradedb_v1.4_v1.5_41.mysql b/sql/civicrm_upgradedb_v1.4_v1.5_41.mysql
index 3083b663e2..502d786493 100644
--- a/sql/civicrm_upgradedb_v1.4_v1.5_41.mysql
+++ b/sql/civicrm_upgradedb_v1.4_v1.5_41.mysql
@@ -47,20 +47,20 @@ CREATE TABLE civicrm_membership_type (
      relationship_type_id int unsigned    COMMENT 'FK to Relationship Type ID',
      visibility varchar(64)    ,
      weight int    ,
-     is_active tinyint   DEFAULT 1 COMMENT 'Is this membership_type enabled' 
+     is_active tinyint   DEFAULT 1 COMMENT 'Is this membership_type enabled'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      
+
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-,      
+,
      FOREIGN KEY (member_of_contact_id) REFERENCES civicrm_contact(id)
-,      
+,
      FOREIGN KEY (contribution_type_id) REFERENCES civicrm_contribution_type(id)
-,      
+,
      FOREIGN KEY (relationship_type_id) REFERENCES civicrm_relationship_type(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -86,14 +86,14 @@ CREATE TABLE civicrm_membership_status (
      is_admin tinyint    COMMENT 'Is this status for admin/manual assignment only.',
      weight int    ,
      is_default tinyint    COMMENT 'Assign this status to a membership record if no other status match is found.',
-     is_active tinyint   DEFAULT 1 COMMENT 'Is this membership_status enabled.' 
+     is_active tinyint   DEFAULT 1 COMMENT 'Is this membership_status enabled.'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      
+
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -114,18 +114,18 @@ CREATE TABLE civicrm_membership (
      end_date date    COMMENT 'Current membership period expire date.',
      source varchar(128)    ,
      status_id int unsigned NOT NULL   COMMENT 'FK to Membership Status',
-     is_override tinyint    COMMENT 'Admin users may set a manual status which overrides the calculated status. When this flag is true, automated status update scripts should NOT modify status for the record.' 
+     is_override tinyint    COMMENT 'Admin users may set a manual status which overrides the calculated status. When this flag is true, automated status update scripts should NOT modify status for the record.'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      
+
+
+,
      FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id)
-,      
+,
      FOREIGN KEY (membership_type_id) REFERENCES civicrm_membership_type(id)
-,      
+,
      FOREIGN KEY (status_id) REFERENCES civicrm_membership_status(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -151,16 +151,16 @@ CREATE TABLE civicrm_membership_block (
      renewal_title varchar(255)    COMMENT 'Title for renewal',
      renewal_text text    COMMENT 'Text to display for member renewal',
      is_required tinyint   DEFAULT 0 COMMENT 'Is membership sign up optional',
-     is_active tinyint   DEFAULT 1 COMMENT 'Is this membership_block enabled' 
+     is_active tinyint   DEFAULT 1 COMMENT 'Is this membership_block enabled'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      
+
+
+,
      FOREIGN KEY (entity_id) REFERENCES civicrm_contribution_page(id)
-,      
+,
      FOREIGN KEY (membership_type_default) REFERENCES civicrm_membership_type(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -179,18 +179,18 @@ CREATE TABLE civicrm_membership_log (
      start_date date    COMMENT 'New membership period start date',
      end_date date    COMMENT 'New membership period expiration date.',
      modified_id int unsigned    COMMENT 'FK to Contact ID of person under whose credentials this data modification was made.',
-     modified_date date    COMMENT 'Date this membership modification action was logged.' 
+     modified_date date    COMMENT 'Date this membership modification action was logged.'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      
+
+
+,
      FOREIGN KEY (membership_id) REFERENCES civicrm_membership(id)
-,      
+,
      FOREIGN KEY (status_id) REFERENCES civicrm_membership_status(id)
-,      
+,
      FOREIGN KEY (modified_id) REFERENCES civicrm_contact(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -206,18 +206,18 @@ CREATE TABLE civicrm_membership_payment (
      id int unsigned NOT NULL AUTO_INCREMENT  ,
      membership_id int unsigned NOT NULL   COMMENT 'FK to Membership table',
      payment_entity_table varchar(128)    COMMENT 'Table being referenced for payment entity.',
-     payment_entity_id int unsigned    COMMENT 'FK to table with payment record (expected usage is civicrm_contribution).' 
+     payment_entity_id int unsigned    COMMENT 'FK to table with payment record (expected usage is civicrm_contribution).'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_payment_entity(
         payment_entity_table
       , payment_entity_id
   )
-  
-,      
+
+,
      FOREIGN KEY (membership_id) REFERENCES civicrm_membership(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -233,18 +233,18 @@ CREATE TABLE civicrm_option_group (
      name varchar(64) NOT NULL   COMMENT 'Option group name. Used as selection key by class properties which lookup options in civicrm_option_value.',
      description varchar(255)    COMMENT 'Option group description.',
      is_reserved tinyint    COMMENT 'Is this a predefined system option group (i.e. it can not be deleted)?',
-     is_active tinyint    COMMENT 'Is this option group active?' 
+     is_active tinyint    COMMENT 'Is this option group active?'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     UNIQUE INDEX option_group_name_domain_id(
         name
       , domain_id
   )
-  
-,      
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -267,18 +267,18 @@ CREATE TABLE civicrm_option_value (
      description varchar(255)    COMMENT 'Optional description.',
      is_optgroup tinyint   DEFAULT 0 COMMENT 'Is this row simply a display header? Expected usage is to render these as OPTGROUP tags within a SELECT field list of options?',
      is_reserved tinyint   DEFAULT 0 COMMENT 'Is this a predefined system object?',
-     is_active tinyint   DEFAULT 1 COMMENT 'Is this option active?' 
+     is_active tinyint   DEFAULT 1 COMMENT 'Is this option active?'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_option_group_id_value(
         value
       , option_group_id
   )
-  
-,      
+
+,
      FOREIGN KEY (option_group_id) REFERENCES civicrm_option_group(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -301,21 +301,21 @@ CREATE TABLE civicrm_project (
      start_date datetime    COMMENT 'Project start date.',
      end_date datetime    COMMENT 'Project end date.',
      is_active tinyint    COMMENT 'Is this record active? For Projects: can tasks be created for it, does it appear on project listings, etc.',
-     status_id int unsigned    COMMENT 'Configurable status value (e.g. Planned, Active, Closed...). FK to civicrm_option_value.' 
+     status_id int unsigned    COMMENT 'Configurable status value (e.g. Planned, Active, Closed...). FK to civicrm_option_value.'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     UNIQUE INDEX UI_project_owner(
         id
       , owner_entity_table
       , owner_entity_id
   )
-  
-,      
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-,      
+,
      FOREIGN KEY (status_id) REFERENCES civicrm_option_value(value)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -340,10 +340,10 @@ CREATE TABLE civicrm_task (
      due_date datetime    COMMENT 'Task due date.',
      priority_id int unsigned    COMMENT 'Configurable priority value (e.g. Critical, High, Medium...). FK to civicrm_option_value.',
      task_class varchar(255)    COMMENT 'Optional key to a process class related to this task (e.g. CRM_Quest_PreApp).',
-     is_active tinyint    COMMENT 'Is this record active? For tasks: can it be assigned, does it appear on open task listings, etc.' 
+     is_active tinyint    COMMENT 'Is this record active? For tasks: can it be assigned, does it appear on open task listings, etc.'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     UNIQUE INDEX UI_task_parent(
         id
       , parent_entity_table
@@ -354,14 +354,14 @@ CREATE TABLE civicrm_task (
       , owner_entity_table
       , owner_entity_id
   )
-  
-,      
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-,      
+,
      FOREIGN KEY (task_type_id) REFERENCES civicrm_option_value(value)
-,      
+,
      FOREIGN KEY (priority_id) REFERENCES civicrm_option_value(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -383,10 +383,10 @@ CREATE TABLE civicrm_task_status (
      status_detail text    COMMENT 'Encoded array of status details used for programmatic progress reporting and tracking.',
      status_id int unsigned    COMMENT 'Configurable status value (e.g. Not Started, In Progress, Completed, Deferred...). FK to civicrm_option_value.',
      create_date datetime    COMMENT 'Date this record was created (date work on task started).',
-     modified_date datetime    COMMENT 'Date-time of last update to this task_status record.' 
+     modified_date datetime    COMMENT 'Date-time of last update to this task_status record.'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_task_status_responsible(
         task_id
       , responsible_entity_table
@@ -397,12 +397,12 @@ CREATE TABLE civicrm_task_status (
       , target_entity_table
       , target_entity_id
   )
-  
-,      
+
+,
      FOREIGN KEY (task_id) REFERENCES civicrm_task(id)
-,      
+,
      FOREIGN KEY (status_id) REFERENCES civicrm_option_value(value)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -421,18 +421,18 @@ CREATE TABLE civicrm_log (
      entity_id int unsigned NOT NULL   COMMENT 'Foreign key to the referenced item.',
      data text    COMMENT 'Updates does to this object if any.',
      modified_id int unsigned    COMMENT 'FK to Contact ID of person under whose credentials this data modification was made.',
-     modified_date datetime    COMMENT 'When was the referenced entity created or modified or deleted.' 
+     modified_date datetime    COMMENT 'When was the referenced entity created or modified or deleted.'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_entity(
         entity_table
       , entity_id
   )
-  
-,      
+
+,
      FOREIGN KEY (modified_id) REFERENCES civicrm_contact(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -452,14 +452,14 @@ CREATE TABLE civicrm_file (
      uri varchar(255)    COMMENT 'uri of the file on disk',
      document mediumblob    COMMENT 'contents of the document',
      description varchar(255)    COMMENT 'Additional descriptive text regarding this attachment (optional).',
-     upload_date datetime    COMMENT 'Date and time that this attachment was uploaded or written to server.' 
+     upload_date datetime    COMMENT 'Date and time that this attachment was uploaded or written to server.'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      
+
+
+,
      FOREIGN KEY (file_type_id) REFERENCES civicrm_option_value(value)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -475,10 +475,10 @@ CREATE TABLE civicrm_entity_file (
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'primary key',
      entity_table varchar(64)    COMMENT 'physical tablename for entity being joined to file, e.g. civicrm_contact',
      entity_id int unsigned NOT NULL   COMMENT 'FK to entity table specified in entity_table column.',
-     file_id int unsigned NOT NULL   COMMENT 'FK to civicrm_file' 
+     file_id int unsigned NOT NULL   COMMENT 'FK to civicrm_file'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_entity(
         entity_table
       , entity_id
@@ -488,10 +488,10 @@ CREATE TABLE civicrm_entity_file (
       , entity_id
       , file_id
   )
-  
-,      
+
+,
      FOREIGN KEY (file_id) REFERENCES civicrm_file(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 
@@ -509,7 +509,7 @@ CREATE TABLE civicrm_entity_file (
 -- *******************************************************/
    ALTER TABLE `civicrm_contact` DROP INDEX `index_sort_name`;
     ALTER TABLE `civicrm_contact` DROP `hash`;
-  
+
    ALTER TABLE `civicrm_contact` ADD hash varchar(32) DEFAULT NULL COMMENT 'Key for validating requests related to this contact.';
    ALTER TABLE `civicrm_contact` ADD contact_sub_type varchar(64) DEFAULT NULL COMMENT 'May be used to over-ride contact view and edit templates.';
 
@@ -517,21 +517,21 @@ CREATE TABLE civicrm_entity_file (
 
    ALTER TABLE `civicrm_contact` ADD INDEX index_sort_name_domain(sort_name, domain_id, hash);
 
-   ALTER TABLE `civicrm_contact` ADD INDEX index_hash_domain(hash, domain_id);  
+   ALTER TABLE `civicrm_contact` ADD INDEX index_hash_domain(hash, domain_id);
 
 -- /*******************************************************
 -- *
 -- * fix preferred communication data
 -- *******************************************************/
   SELECT @domain_id := id from civicrm_domain;
-    INSERT INTO 
-    `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`) 
-    VALUES 
+    INSERT INTO
+    `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`)
+    VALUES
     (@domain_id, 'preferred_communication_method', 'Preferred Communication Method'     , 0, 1);
     SELECT @option_group_id_pcm := max(id) from civicrm_option_group where name = 'preferred_communication_method';
 
-    INSERT INTO 
-   `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`) 
+    INSERT INTO
+   `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`)
     VALUES
     (@option_group_id_pcm, 'Phone', 1, NULL, NULL, 0, NULL, 1, NULL, 0, 0, 1),
     (@option_group_id_pcm, 'Email', 2, NULL, NULL, 0, NULL, 2, NULL, 0, 0, 1),
@@ -589,7 +589,7 @@ CREATE TABLE civicrm_entity_file (
   ALTER TABLE `civicrm_custom_value` ADD file_id int(10) unsigned DEFAULT NULL COMMENT 'FK to civicrm_file';
   ALTER TABLE `civicrm_custom_value` ADD INDEX (`file_id`);
   ALTER TABLE `civicrm_custom_value` ADD FOREIGN KEY (`file_id`) REFERENCES `civicrm_file`(`id`);
-  
+
 
 -- /*******************************************************
 -- *
@@ -629,8 +629,8 @@ CREATE TABLE civicrm_entity_file (
 
   ALTER TABLE `civicrm_uf_group` ADD add_to_group_id int unsigned DEFAULT NULL COMMENT 'foreign key to civicrm_group_id';
   ALTER TABLE `civicrm_uf_group` ADD INDEX (`add_to_group_id`);
-  ALTER TABLE `civicrm_uf_group` ADD FOREIGN KEY (`add_to_group_id`) REFERENCES `civicrm_group` (`id`);  
-  
+  ALTER TABLE `civicrm_uf_group` ADD FOREIGN KEY (`add_to_group_id`) REFERENCES `civicrm_group` (`id`);
+
   ALTER TABLE `civicrm_uf_group` ADD add_captcha tinyint DEFAULT 0 COMMENT 'Should a CAPTCHA widget be included this Profile form.';
 
   ALTER TABLE `civicrm_uf_group` ADD cancel_URL varchar(255) DEFAULT NULL COMMENT 'Redirect to URL when Cancle button clik .';
diff --git a/sql/civicrm_upgradedb_v1.5_v1.6_40.mysql b/sql/civicrm_upgradedb_v1.5_v1.6_40.mysql
index 8c58ab3441..dfa6977598 100644
--- a/sql/civicrm_upgradedb_v1.5_v1.6_40.mysql
+++ b/sql/civicrm_upgradedb_v1.5_v1.6_40.mysql
@@ -34,9 +34,9 @@
 -- *
 -- *******************************************************/
 
-INSERT INTO 
-   `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`) 
-VALUES 
+INSERT INTO
+   `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`)
+VALUES
    (@domain_id, 'activity_type'                 , 'Activity Type'                      , 0, 1),
    (@domain_id, 'gender'                        , 'Gender'                             , 0, 1),
    (@domain_id, 'instant_messenger_service'     , 'Instant Messenger (IM) screen-names', 0, 1),
@@ -59,8 +59,8 @@ SELECT @option_group_id_acc            := max(id) from civicrm_option_group wher
 SELECT @option_group_id_pi             := max(id) from civicrm_option_group where name = 'payment_instrument';
 SELECT @option_group_id_cs             := max(id) from civicrm_option_group where name = 'contribution_status';
 
-INSERT INTO 
-   `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`) 
+INSERT INTO
+   `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`)
 VALUES
    (@option_group_id_act, 'Meeting', 1, 'Meeting',NULL, 0, NULL, 1, 'Schedule a meeting', 0, 0, 1),
    (@option_group_id_act, 'Phone Call', 2, 'Phone Call', NULL,  0, NULL, 2, 'Schedule a Phone Call', 0, 0, 1),
@@ -177,8 +177,8 @@ VALUES
 
 DROP TABLE IF EXISTS civicrm_accept_credit_card;
 DROP TABLE IF EXISTS civicrm_activity_type;
-DROP TABLE IF EXISTS civicrm_acl_group; 
-DROP TABLE IF EXISTS civicrm_acl_group_join; 
+DROP TABLE IF EXISTS civicrm_acl_group;
+DROP TABLE IF EXISTS civicrm_acl_group_join;
 DROP TABLE IF EXISTS civicrm_gender;
 DROP TABLE IF EXISTS civicrm_individual_prefix;
 DROP TABLE IF EXISTS civicrm_individual_suffix;
@@ -200,17 +200,17 @@ CREATE TABLE civicrm_acl_cache (
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'Unique table ID',
      contact_id int unsigned    COMMENT 'Foreign Key to Contact',
      acl_id int unsigned NOT NULL   COMMENT 'Foreign Key to ACL',
-     modified_date date    COMMENT 'When was this cache entry last modified' 
+     modified_date date    COMMENT 'When was this cache entry last modified'
 ,
     PRIMARY KEY ( id )
- 
- 
-,      INDEX FKEY_contact_id ( contact_id ) ,  
+
+
+,      INDEX FKEY_contact_id ( contact_id ) ,
      FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id)
-,      INDEX FKEY_acl_id ( acl_id ) ,  
+,      INDEX FKEY_acl_id ( acl_id ) ,
      FOREIGN KEY (acl_id) REFERENCES civicrm_acl(id)
 ,    INDEX index_acl_id( acl_id)
-  
+
 )  TYPE=InnoDB;
 
 -- /*******************************************************
@@ -228,10 +228,10 @@ CREATE TABLE civicrm_acl_entity_role (
      acl_role_id int unsigned NOT NULL   COMMENT 'Foreign Key to ACL Role (which is an option value pair and hence an implicit FK)',
      entity_table varchar(64) NOT NULL   COMMENT 'Table of the object joined to the ACL Role (Contact or Group)',
      entity_id int unsigned NOT NULL   COMMENT 'ID of the group/contact object being joined',
-     is_active tinyint    COMMENT 'Is this property active?' 
+     is_active tinyint    COMMENT 'Is this property active?'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_role(
         acl_role_id
   )
@@ -239,10 +239,10 @@ CREATE TABLE civicrm_acl_entity_role (
         entity_table
       , entity_id
   )
-  
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -262,16 +262,16 @@ CREATE TABLE civicrm_msg_template (
      msg_subject varchar(255)    COMMENT 'Subject for email message.',
      msg_text text    COMMENT 'Text formatted message',
      msg_html text    COMMENT 'HTML formatted message',
-     is_active tinyint   DEFAULT 1  
+     is_active tinyint   DEFAULT 1
 ,
     PRIMARY KEY ( id )
- 
- 
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+
+
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  TYPE=InnoDB  ;
-  
+
 -- /*******************************************************
 -- *
 -- * Modify the civicrm_acl  Table Structure
@@ -286,7 +286,7 @@ CREATE TABLE civicrm_msg_template (
   ALTER TABLE `civicrm_acl` CHANGE `operation` `operation` ENUM('All', 'View', 'Edit', 'Create', 'Delete', 'Grant', 'Revoke') NOT NULL   COMMENT 'What operation does this ACL entry control?';
 
   ALTER TABLE `civicrm_acl` ADD is_active tinyint(4) COMMENT 'Is this property active?';
-  
+
   ALTER TABLE `civicrm_acl` ADD INDEX index_acl_id (acl_id);
 
 -- /*******************************************************
@@ -322,38 +322,38 @@ CREATE TABLE civicrm_msg_template (
   ALTER TABLE civicrm_contact ADD INDEX index_contact_type_domain (contact_type, domain_id);
   ALTER TABLE civicrm_contact ADD INDEX index_contact_sub_type_domain (contact_sub_type, domain_id);
   ALTER TABLE civicrm_contact ADD INDEX index_preferred_communication_method (preferred_communication_method);
-  
-  UPDATE civicrm_contact 
-  SET `preferred_communication_method` = CONCAT(char(1),`preferred_communication_method`,char(1)) 
+
+  UPDATE civicrm_contact
+  SET `preferred_communication_method` = CONCAT(char(1),`preferred_communication_method`,char(1))
   WHERE civicrm_contact.preferred_communication_method IS NOT NULL;
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_contribution
 -- *
 -- *******************************************************/
 
-  ALTER TABLE `civicrm_contribution` ADD  `contribution_status_id` int unsigned   DEFAULT '1';  
+  ALTER TABLE `civicrm_contribution` ADD  `contribution_status_id` int unsigned   DEFAULT '1';
   ALTER TABLE `civicrm_contribution` DROP FOREIGN KEY `civicrm_contribution_ibfk_6`;
   ALTER TABLE `civicrm_contribution` DROP FOREIGN KEY `civicrm_contribution_ibfk_7`;
   ALTER TABLE `civicrm_contribution` DROP INDEX `FKEY_payment_instrument_id`;
   ALTER TABLE `civicrm_contribution` DROP INDEX `FKEY_recur_contribution_id`;
-  
+
   ALTER TABLE `civicrm_contribution` DROP recur_contribution_id;
-  
+
   ALTER TABLE `civicrm_contribution` ADD is_test tinyint NULL DEFAULT 0;
   ALTER TABLE `civicrm_contribution` ADD `honor_contact_id` int unsigned COMMENT 'FK to contact ID';
   ALTER TABLE `civicrm_contribution` ADD contribution_recur_id int unsigned AFTER note;
   ALTER TABLE `civicrm_contribution` ADD INDEX FKEY_contribution_recur_id (contribution_recur_id);
   ALTER TABLE `civicrm_contribution` ADD CONSTRAINT FOREIGN KEY (`contribution_recur_id`) REFERENCES civicrm_contribution_recur (`id`);
-  
+
   ALTER TABLE `civicrm_contribution` ADD INDEX `UI_contrib_payment_instrument_id`(payment_instrument_id);
   ALTER TABLE `civicrm_contribution` ADD INDEX `index_contribution_status` (contribution_status_id);
   ALTER TABLE `civicrm_contribution` ADD INDEX FKEY_honor_contact_id (honor_contact_id);
   ALTER TABLE `civicrm_contribution` ADD CONSTRAINT FOREIGN KEY (`honor_contact_id`) REFERENCES `civicrm_contact` (`id`);
 
   UPDATE civicrm_contribution SET contribution_status_id=3          WHERE cancel_date IS NOT NULL;
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_contribution_page
@@ -374,27 +374,27 @@ CREATE TABLE civicrm_msg_template (
 -- * civicrm_contribution_recur
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE `civicrm_contribution_recur` ADD domain_id int unsigned NOT NULL DEFAULT '0' COMMENT 'Which Domain owns this contact';
   ALTER TABLE `civicrm_contribution_recur` ADD trxn_id varchar(255) COMMENT 'unique transaction id. may be processor id, bank id + trans id, or account number + check number... depending on payment_method';
   ALTER TABLE `civicrm_contribution_recur` ADD  invoice_id varchar(255) COMMENT 'unique invoice id, system generated or passed in';
   ALTER TABLE `civicrm_contribution_recur` ADD contribution_status_id int unsigned NULL DEFAULT '1' AFTER invoice_id;
   ALTER TABLE `civicrm_contribution_recur` ADD end_date datetime NOT NULL AFTER cancel_date;
   ALTER TABLE `civicrm_contribution_recur` ADD is_test tinyint NULL DEFAULT '0' AFTER contribution_status_id;
-  
+
   ALTER TABLE `civicrm_contribution_recur` MODIFY start_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
       ALTER TABLE `civicrm_contribution_recur` MODIFY create_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
       ALTER TABLE `civicrm_contribution_recur` MODIFY modified_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
       ALTER TABLE `civicrm_contribution_recur` MODIFY cancel_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
       ALTER TABLE `civicrm_contribution_recur` MODIFY next_sched_contribution datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
       ALTER TABLE `civicrm_contribution_recur` MODIFY failure_retry_date datetime NULL DEFAULT NULL;
-  
+
   ALTER TABLE `civicrm_contribution_recur` DROP is_active;
-  
+
   ALTER TABLE `civicrm_contribution_recur` ADD INDEX FKEY_domain_id (domain_id);
-  ALTER TABLE `civicrm_contribution_recur` ADD INDEX index_contribution_status (contribution_status_id);  
-  ALTER TABLE `civicrm_contribution_recur` ADD FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id);  
-    
+  ALTER TABLE `civicrm_contribution_recur` ADD INDEX index_contribution_status (contribution_status_id);
+  ALTER TABLE `civicrm_contribution_recur` ADD FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id);
+
 -- /*******************************************************
 -- *
 -- * civicrm_custom_group
@@ -407,27 +407,27 @@ CREATE TABLE civicrm_msg_template (
   ALTER TABLE `civicrm_custom_group` ADD extends_entity_column_value varchar(64) COMMENT 'linking custom group for dynamic object';
 
   ALTER TABLE `civicrm_custom_group` MODIFY extends enum('Contact','Individual','Household','Organization','Location','Address','Contribution','Activity','Relationship','Phonecall','Meeting','Group','Membership') NULL DEFAULT 'Contact' COMMENT 'Type of object this group extends (can add other options later e.g. contact_address, etc.).';
-  
+
    UPDATE civicrm_custom_group
    SET extends_entity_column_value=NULL
    WHERE extends='Activity';
-  
+
   UPDATE civicrm_custom_group
    SET extends='Activity', extends_entity_column_value='2'
    WHERE extends='Phonecall';
-  
+
   UPDATE civicrm_custom_group
    SET extends='Activity', extends_entity_column_value='1'
    WHERE extends='Meeting';
-  
+
   UPDATE civicrm_custom_group
    SET extends_entity_column_value=NULL
    WHERE extends='Contact';
-  
+
   UPDATE civicrm_custom_group
    SET extends_entity_column_value=NULL
    WHERE extends='Relationship';
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_custom_value
@@ -506,19 +506,19 @@ CREATE TABLE civicrm_msg_template (
 -- * Define contact-individual specific properties. Extends civicrm_contact.
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE civicrm_individual DROP FOREIGN KEY civicrm_individual_ibfk_2;
   ALTER TABLE civicrm_individual DROP FOREIGN KEY civicrm_individual_ibfk_3;
   ALTER TABLE civicrm_individual DROP FOREIGN KEY civicrm_individual_ibfk_4;
-  
+
   ALTER TABLE civicrm_individual DROP INDEX FKEY_prefix_id;
       ALTER TABLE civicrm_individual DROP INDEX FKEY_suffix_id;
       ALTER TABLE civicrm_individual DROP INDEX FKEY_gender_id;
-    
+
   ALTER TABLE civicrm_individual ADD INDEX UI_prefix (prefix_id);
       ALTER TABLE civicrm_individual ADD INDEX UI_suffix (suffix_id);
       ALTER TABLE civicrm_individual ADD INDEX UI_gender (gender_id);
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_mapping
@@ -536,7 +536,7 @@ CREATE TABLE civicrm_msg_template (
 -- * Contact Membership records.
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE civicrm_membership ADD reminder_date date AFTER is_override;
 
 -- /*******************************************************
@@ -546,7 +546,7 @@ CREATE TABLE civicrm_msg_template (
 -- * Logs actions which affect a Membership record (signup, status override, renewal, etc.)
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE civicrm_membership_log ADD renewal_reminder_date date AFTER modified_date;
 
 -- /*******************************************************
@@ -556,13 +556,13 @@ CREATE TABLE civicrm_msg_template (
 -- * Sites can configure multiple types of memberships. They encode the owner organization, fee, and the rules needed to set start and end (expire) dates when a member signs up for that type.
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE civicrm_membership_type ADD renewal_msg_id int unsigned AFTER weight;
       ALTER TABLE civicrm_membership_type ADD renewal_reminder_day int AFTER renewal_msg_id;
-  
+
   ALTER TABLE civicrm_membership_type ADD INDEX FKEY_renewal_msg_id ( renewal_msg_id );
   ALTER TABLE civicrm_membership_type ADD FOREIGN KEY (renewal_msg_id) REFERENCES civicrm_msg_template(id);
-    
+
 -- /*******************************************************
 -- *
 -- * civicrm_phone
@@ -586,7 +586,7 @@ CREATE TABLE civicrm_msg_template (
 
   ALTER TABLE civicrm_project DROP FOREIGN KEY civicrm_project_ibfk_2;
   ALTER TABLE civicrm_project DROP INDEX FKEY_status_id;
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_saved_search
@@ -599,7 +599,7 @@ CREATE TABLE civicrm_msg_template (
 
   ALTER TABLE `civicrm_saved_search` ADD select_tables text DEFAULT NULL COMMENT 'the tables to be included in a select data';
 
-  ALTER TABLE `civicrm_saved_search` ADD where_tables text DEFAULT NULL COMMENT 'the tables to be included in the count statement'; 
+  ALTER TABLE `civicrm_saved_search` ADD where_tables text DEFAULT NULL COMMENT 'the tables to be included in the count statement';
 
 -- /*******************************************************/
 
@@ -613,7 +613,7 @@ CREATE TABLE civicrm_msg_template (
 
   ALTER TABLE `civicrm_task` DROP FOREIGN KEY civicrm_task_ibfk_2;
   ALTER TABLE `civicrm_task` DROP FOREIGN KEY civicrm_task_ibfk_3;
-  
+
   ALTER TABLE `civicrm_task` DROP INDEX FKEY_task_type_id;
   ALTER TABLE `civicrm_task` DROP INDEX FKEY_priority_id;
 
@@ -624,7 +624,7 @@ CREATE TABLE civicrm_msg_template (
 -- * Tracks the responsible entity, optional target entity and status of a task. Tasks can have multiple task_status entries if assigned to multiple responsible entities and-or there are multiple targets.
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE `civicrm_task_status` DROP FOREIGN KEY civicrm_task_status_ibfk_2;
   ALTER TABLE `civicrm_task_status` DROP INDEX FKEY_status_id;
 
@@ -646,14 +646,14 @@ CREATE TABLE civicrm_msg_template (
 
     CREATE UNIQUE INDEX UI_contact_group ON civicrm_group_contact(contact_id,group_id);
     CREATE UNIQUE INDEX UI_contact ON civicrm_individual(contact_id);
-    CREATE UNIQUE INDEX UI_contact ON civicrm_household(contact_id); 
+    CREATE UNIQUE INDEX UI_contact ON civicrm_household(contact_id);
     CREATE UNIQUE INDEX UI_contact ON civicrm_organization(contact_id);
-    
-    CREATE UNIQUE INDEX UI_location ON civicrm_address(location_id); 
-    
+
+    CREATE UNIQUE INDEX UI_location ON civicrm_address(location_id);
+
     CREATE UNIQUE INDEX UI_contact ON civicrm_uf_match(contact_id);
     DROP INDEX UI_uf_id ON civicrm_uf_match;
-    CREATE UNIQUE INDEX UI_uf_id ON civicrm_uf_match(uf_id);    
+    CREATE UNIQUE INDEX UI_uf_id ON civicrm_uf_match(uf_id);
     CREATE UNIQUE INDEX UI_contrib_trxn_id_domain_id ON civicrm_contribution_recur(trxn_id, domain_id);
     CREATE UNIQUE INDEX UI_contrib_invoice_id_domain_id ON civicrm_contribution_recur(invoice_id, domain_id);
-  
+
diff --git a/sql/civicrm_upgradedb_v1.5_v1.6_41.mysql b/sql/civicrm_upgradedb_v1.5_v1.6_41.mysql
index 42e98500df..ebabf91df8 100644
--- a/sql/civicrm_upgradedb_v1.5_v1.6_41.mysql
+++ b/sql/civicrm_upgradedb_v1.5_v1.6_41.mysql
@@ -34,9 +34,9 @@
 -- *
 -- *******************************************************/
 
-INSERT INTO 
-   `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`) 
-VALUES 
+INSERT INTO
+   `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`)
+VALUES
    (@domain_id, 'activity_type'                 , 'Activity Type'                      , 0, 1),
    (@domain_id, 'gender'                        , 'Gender'                             , 0, 1),
    (@domain_id, 'instant_messenger_service'     , 'Instant Messenger (IM) screen-names', 0, 1),
@@ -59,8 +59,8 @@ SELECT @option_group_id_acc            := max(id) from civicrm_option_group wher
 SELECT @option_group_id_pi             := max(id) from civicrm_option_group where name = 'payment_instrument';
 SELECT @option_group_id_cs             := max(id) from civicrm_option_group where name = 'contribution_status';
 
-INSERT INTO 
-   `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`) 
+INSERT INTO
+   `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`)
 VALUES
    (@option_group_id_act, 'Meeting', 1, 'Meeting',NULL, 0, NULL, 1, 'Schedule a meeting', 0, 0, 1),
    (@option_group_id_act, 'Phone Call', 2, 'Phone Call', NULL,  0, NULL, 2, 'Schedule a Phone Call', 0, 0, 1),
@@ -176,7 +176,7 @@ VALUES
 
 DROP TABLE IF EXISTS civicrm_accept_credit_card;
 DROP TABLE IF EXISTS civicrm_activity_type;
-DROP TABLE IF EXISTS civicrm_acl_group; 
+DROP TABLE IF EXISTS civicrm_acl_group;
 DROP TABLE IF EXISTS civicrm_gender;
 DROP TABLE IF EXISTS civicrm_individual_prefix;
 DROP TABLE IF EXISTS civicrm_individual_suffix;
@@ -197,7 +197,7 @@ CREATE TABLE civicrm_acl_cache (
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'Unique table ID',
      contact_id int unsigned    COMMENT 'Foreign Key to Contact',
      acl_id int unsigned NOT NULL   COMMENT 'Foreign Key to ACL',
-     modified_date date    COMMENT 'When was this cache entry last modified' 
+     modified_date date    COMMENT 'When was this cache entry last modified'
 ,
     PRIMARY KEY ( id )
 ,
@@ -205,9 +205,9 @@ CREATE TABLE civicrm_acl_cache (
      INDEX contact_id (contact_id)
 ,
      FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id)
-,      
+,
      FOREIGN KEY (acl_id) REFERENCES civicrm_acl(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -223,10 +223,10 @@ CREATE TABLE civicrm_acl_entity_role (
      acl_role_id int unsigned NOT NULL   COMMENT 'Foreign Key to ACL Role (which is an option value pair and hence an implicit FK)',
      entity_table varchar(64) NOT NULL   COMMENT 'Table of the object joined to the ACL Role (Contact or Group)',
      entity_id int unsigned NOT NULL   COMMENT 'ID of the group/contact object being joined',
-     is_active tinyint    COMMENT 'Is this property active?' 
+     is_active tinyint    COMMENT 'Is this property active?'
 ,
     PRIMARY KEY ( id )
- 
+
     ,     INDEX index_role(
         acl_role_id
   )
@@ -237,9 +237,9 @@ CREATE TABLE civicrm_acl_entity_role (
   ,     INDEX domain_id (
   domain_id
   )
-  ,    
+  ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -257,14 +257,14 @@ CREATE TABLE civicrm_msg_template (
      msg_subject varchar(255)    COMMENT 'Subject for email message.',
      msg_text text    COMMENT 'Text formatted message',
      msg_html text    COMMENT 'HTML formatted message',
-     is_active tinyint   DEFAULT 1  
+     is_active tinyint   DEFAULT 1
 ,
     PRIMARY KEY ( id )
- 
- 
-,      
+
+
+,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
 
 -- /*******************************************************
@@ -274,13 +274,13 @@ CREATE TABLE civicrm_msg_template (
 
   ALTER TABLE `civicrm_acl` ADD domain_id int(10) unsigned NOT NULL   COMMENT 'Which Domain owns this contact';
   ALTER TABLE `civicrm_acl` ADD FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`);
-  ALTER TABLE `civicrm_acl` ADD INDEX `domain_id` (`domain_id`);      
+  ALTER TABLE `civicrm_acl` ADD INDEX `domain_id` (`domain_id`);
 
   ALTER TABLE `civicrm_acl` ADD name varchar(64) COMMENT 'ACL Name.';
 
   ALTER TABLE `civicrm_acl` CHANGE `operation` `operation` ENUM('All', 'View', 'Edit', 'Create', 'Delete', 'Grant', 'Revoke') NOT NULL   COMMENT 'What operation does this ACL entry control?';
   ALTER TABLE `civicrm_acl` ADD is_active tinyint(4) COMMENT 'Is this property active?' AFTER acl_id;
-  
+
   ALTER TABLE `civicrm_acl` ADD INDEX index_acl_id (acl_id);
 
 -- /*******************************************************
@@ -290,7 +290,7 @@ CREATE TABLE civicrm_msg_template (
 -- * Join table for activities
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE `civicrm_activity` DROP FOREIGN KEY civicrm_activity_ibfk_2;
   ALTER TABLE `civicrm_activity` ADD INDEX UI_activity_type_id (`activity_type_id`);
 
@@ -314,13 +314,13 @@ CREATE TABLE civicrm_msg_template (
 
   ALTER TABLE civicrm_contact ADD INDEX index_contact_type_domain (contact_type, domain_id);
   ALTER TABLE civicrm_contact ADD INDEX index_contact_sub_type_domain (contact_sub_type, domain_id);
-  
+
   ALTER TABLE civicrm_contact ADD INDEX index_preferred_communication_method (preferred_communication_method);
-  
-  UPDATE civicrm_contact 
-  SET `preferred_communication_method` = CONCAT(char(1),`preferred_communication_method`,char(1)) 
+
+  UPDATE civicrm_contact
+  SET `preferred_communication_method` = CONCAT(char(1),`preferred_communication_method`,char(1))
   WHERE civicrm_contact.preferred_communication_method IS NOT NULL;
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_contribution
@@ -329,21 +329,21 @@ CREATE TABLE civicrm_msg_template (
 
   ALTER TABLE `civicrm_contribution` DROP FOREIGN KEY `civicrm_contribution_ibfk_6`;
   ALTER TABLE `civicrm_contribution` DROP FOREIGN KEY `civicrm_contribution_ibfk_7`;
-  
+
   ALTER TABLE `civicrm_contribution` DROP `recur_contribution_id`;
-  
+
   ALTER TABLE `civicrm_contribution` ADD `honor_contact_id` int unsigned COMMENT 'FK to contact ID';
   ALTER TABLE `civicrm_contribution` ADD FOREIGN KEY (`honor_contact_id`) REFERENCES `civicrm_contact` (`id`);
-  
+
   ALTER TABLE `civicrm_contribution` ADD contribution_recur_id int unsigned COMMENT 'Conditional foreign key to civicrm_contribution_recur id. Each contribution made in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.' AFTER note;
   ALTER TABLE `civicrm_contribution` ADD FOREIGN KEY (`contribution_recur_id`) REFERENCES civicrm_contribution_recur(`id`);
-  
+
   ALTER TABLE `civicrm_contribution` ADD is_test tinyint DEFAULT 0;
   ALTER TABLE `civicrm_contribution` ADD `contribution_status_id` int unsigned NULL DEFAULT '1';
     ALTER TABLE `civicrm_contribution` ADD INDEX honor_contact_id (`honor_contact_id`);
   ALTER TABLE `civicrm_contribution` ADD INDEX UI_contrib_payment_instrument_id (payment_instrument_id);
   ALTER TABLE `civicrm_contribution` ADD INDEX index_contribution_status (contribution_status_id);
-    
+
 -- /*******************************************************
 -- *
 -- * civicrm_contribution_page
@@ -364,25 +364,25 @@ CREATE TABLE civicrm_msg_template (
 -- *
 -- *******************************************************/
   ALTER TABLE civicrm_contribution_recur DROP is_active;
-    
+
   ALTER TABLE civicrm_contribution_recur ADD domain_id int unsigned NOT NULL COMMENT 'Which Domain owns this contribution class.' AFTER id;
       ALTER TABLE civicrm_contribution_recur ADD trxn_id varchar(255) COMMENT 'unique transaction id. may be processor id, bank id + trans id, or account number + check number... depending on payment_method';
       ALTER TABLE civicrm_contribution_recur ADD invoice_id varchar(255) COMMENT 'unique invoice id, system generated or passed in' AFTER trxn_id;
       ALTER TABLE civicrm_contribution_recur ADD contribution_status_id int unsigned NULL DEFAULT '1' AFTER invoice_id;
   ALTER TABLE civicrm_contribution_recur ADD end_date datetime NOT NULL COMMENT 'Date this recurring contribution finished successfully' AFTER cancel_date;
   ALTER TABLE civicrm_contribution_recur ADD is_test tinyint NULL DEFAULT '0'AFTER contribution_status_id  ;
-  
+
   ALTER TABLE civicrm_contribution_recur MODIFY start_date datetime NOT NULL COMMENT 'The date the first scheduled recurring contribution occurs.';
       ALTER TABLE civicrm_contribution_recur MODIFY create_date datetime NOT NULL COMMENT 'When this recurring contribution record was created.';
       ALTER TABLE civicrm_contribution_recur MODIFY modified_date datetime NOT NULL COMMENT 'Last updated date for this record. mostly the last time a payment was received';
       ALTER TABLE civicrm_contribution_recur MODIFY cancel_date datetime NOT NULL COMMENT 'Date this recurring contribution was cancelled by contributor- if we can get access to it';
   ALTER TABLE civicrm_contribution_recur MODIFY next_sched_contribution datetime NOT NULL COMMENT 'At Groundspring this was used by the cron job which triggered payments. If we\'re not doing that but we know about payments, it might still be useful to store for display to org andor contributors.';
       ALTER TABLE civicrm_contribution_recur MODIFY failure_retry_date datetime COMMENT 'At Groundspring we set a business rule to retry failed payments every 7 days - and stored the next scheduled attempt date there.';
-  
-  ALTER TABLE civicrm_contribution_recur ADD INDEX index_contribution_status( contribution_status_id );  
-  
+
+  ALTER TABLE civicrm_contribution_recur ADD INDEX index_contribution_status( contribution_status_id );
+
   ALTER TABLE civicrm_contribution_recur ADD FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id);
-    
+
 -- /*******************************************************
 -- *
 -- * civicrm_custom_group
@@ -390,31 +390,31 @@ CREATE TABLE civicrm_msg_template (
 -- * All extended (custom) properties are associated with a group. These are logical sets of related data.
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE `civicrm_custom_group` ADD extends_entity_column_name varchar(64) COMMENT 'linking custom group for dynamic object';
   ALTER TABLE `civicrm_custom_group` ADD extends_entity_column_value varchar(64) COMMENT 'linking custom group for dynamic object';
   ALTER TABLE `civicrm_custom_group` MODIFY extends enum('Contact','Individual','Household','Organization','Location','Address','Contribution','Activity','Relationship','Phonecall','Meeting','Group','Membership') NULL DEFAULT 'Contact' COMMENT 'Type of object this group extends (can add other options later e.g. contact_address, etc.).';
-  
+
    UPDATE civicrm_custom_group
    SET extends_entity_column_value=NULL
    WHERE extends='Activity';
-  
+
   UPDATE civicrm_custom_group
    SET extends='Activity', extends_entity_column_value='2'
    WHERE extends='Phonecall';
-  
+
   UPDATE civicrm_custom_group
    SET extends='Activity', extends_entity_column_value='1'
    WHERE extends='Meeting';
-  
+
   UPDATE civicrm_custom_group
    SET extends_entity_column_value=NULL
    WHERE extends='Contact';
-  
+
   UPDATE civicrm_custom_group
    SET extends_entity_column_value=NULL
    WHERE extends='Relationship';
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_custom_value
@@ -422,13 +422,13 @@ CREATE TABLE civicrm_msg_template (
 -- * Data store for each extended properties.
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE civicrm_custom_value ADD INDEX index_int_field (int_data, custom_field_id);
       ALTER TABLE civicrm_custom_value ADD INDEX index_float_field (float_data, custom_field_id);
       ALTER TABLE civicrm_custom_value ADD INDEX index_decimal_field (decimal_data, custom_field_id);
       ALTER TABLE civicrm_custom_value ADD INDEX index_char_field (char_data, custom_field_id);
       ALTER TABLE civicrm_custom_value ADD INDEX index_date_field (date_data, custom_field_id);
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_domain
@@ -457,11 +457,11 @@ CREATE TABLE civicrm_msg_template (
 -- * Data store for uploaded (attached) files (pointer to file on disk OR blob). Maybe be joined to entities via custom_value.file_id or entity_file table.
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE `civicrm_file` DROP FOREIGN KEY `civicrm_file_ibfk_1`;
   ALTER TABLE `civicrm_file` DROP `file_type_id`;
-  ALTER TABLE `civicrm_file` ADD file_type_id int unsigned    COMMENT 'Type of file (e.g. Transcript, Income Tax Return, etc). FK to civicrm_option_value.';  
-  
+  ALTER TABLE `civicrm_file` ADD file_type_id int unsigned    COMMENT 'Type of file (e.g. Transcript, Income Tax Return, etc). FK to civicrm_option_value.';
+
 -- /*******************************************************
 -- *
 -- * civicrm_group
@@ -512,7 +512,7 @@ CREATE TABLE civicrm_msg_template (
 -- * Define contact-individual specific properties. Extends civicrm_contact.
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE civicrm_individual DROP FOREIGN KEY civicrm_individual_ibfk_1;
   ALTER TABLE civicrm_individual DROP FOREIGN KEY civicrm_individual_ibfk_2;
   ALTER TABLE civicrm_individual DROP FOREIGN KEY civicrm_individual_ibfk_3;
@@ -528,7 +528,7 @@ CREATE TABLE civicrm_msg_template (
 -- * Store field mappings in import or export for reuse
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE `civicrm_mapping` MODIFY mapping_type enum('Export','Import','Export Contributions','Import Contributions','Import Activity History','Search Builder','Import Memberships') COMMENT 'Type of Mapping.';
 
 -- /*******************************************************
@@ -538,7 +538,7 @@ CREATE TABLE civicrm_msg_template (
 -- * Contact Membership records.
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE `civicrm_membership` ADD reminder_date date COMMENT 'When should a reminder be sent.' AFTER is_override;
 
 -- /*******************************************************
@@ -548,7 +548,7 @@ CREATE TABLE civicrm_msg_template (
 -- * Logs actions which affect a Membership record (signup, status override, renewal, etc.)
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE civicrm_membership_log ADD renewal_reminder_date date COMMENT 'The day we sent a renewal reminder' AFTER modified_date;
 
 -- /*******************************************************
@@ -558,12 +558,12 @@ CREATE TABLE civicrm_msg_template (
 -- * Sites can configure multiple types of memberships. They encode the owner organization, fee, and the rules needed to set start and end (expire) dates when a member signs up for that type.
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE civicrm_membership_type ADD renewal_msg_id int unsigned COMMENT 'FK to civicrm_msg_template.id' AFTER weight;
       ALTER TABLE civicrm_membership_type ADD renewal_reminder_day int COMMENT 'Number of days prior to expiration to send renewal reminder' AFTER renewal_msg_id;
-  
+
   ALTER TABLE civicrm_membership_type ADD FOREIGN KEY (renewal_msg_id) REFERENCES civicrm_msg_template(id);
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_organization
@@ -571,9 +571,9 @@ CREATE TABLE civicrm_msg_template (
 -- * Define organization specific properties
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE civicrm_organization DROP FOREIGN KEY civicrm_organization_ibfk_1;
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_phone
@@ -610,7 +610,7 @@ CREATE TABLE civicrm_msg_template (
 
   ALTER TABLE `civicrm_saved_search` ADD select_tables text DEFAULT NULL COMMENT 'the tables to be included in a select data';
 
-  ALTER TABLE `civicrm_saved_search` ADD where_tables text DEFAULT NULL COMMENT 'the tables to be included in the count statement'; 
+  ALTER TABLE `civicrm_saved_search` ADD where_tables text DEFAULT NULL COMMENT 'the tables to be included in the count statement';
 
 -- /*******************************************************
 -- *
@@ -627,7 +627,7 @@ CREATE TABLE civicrm_msg_template (
   ALTER TABLE `civicrm_task` DROP FOREIGN KEY civicrm_task_ibfk_3;
   ALTER TABLE `civicrm_task` DROP `priority_id`;
   ALTER TABLE `civicrm_task` ADD priority_id int unsigned    COMMENT 'Configurable priority value (e.g. Critical, High, Medium...). FK to civicrm_option_value.';
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_task_status
@@ -639,7 +639,7 @@ CREATE TABLE civicrm_msg_template (
   ALTER TABLE `civicrm_task_status` DROP FOREIGN KEY civicrm_task_status_ibfk_2;
   ALTER TABLE `civicrm_task_status` DROP `status_id`;
   ALTER TABLE `civicrm_task_status` ADD status_id int unsigned    COMMENT 'Configurable status value (e.g. Not Started, In Progress, Completed, Deferred...). FK to civicrm_option_value.';
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_uf_group
@@ -649,7 +649,7 @@ CREATE TABLE civicrm_msg_template (
 -- *******************************************************/
 
   ALTER TABLE `civicrm_uf_group` ADD is_edit_link tinyint NULL DEFAULT '0' COMMENT 'Should edit link display in profile selector';
-  
+
 -- /*******************************************************
 -- *
 -- * Add UNIQUE indexes to maintain data integrity
diff --git a/sql/civicrm_upgradedb_v1.6_v1.7_40.mysql b/sql/civicrm_upgradedb_v1.6_v1.7_40.mysql
index b3e52e4fb0..fdf0e87053 100644
--- a/sql/civicrm_upgradedb_v1.6_v1.7_40.mysql
+++ b/sql/civicrm_upgradedb_v1.6_v1.7_40.mysql
@@ -50,13 +50,13 @@ CREATE TABLE civicrm_event (
      is_monetary tinyint   DEFAULT 1 COMMENT 'Is this a PAID event? If true, one or more fee amounts must be set and a Payment Processor must be configured for Online Event Registration.',
      contribution_type_id int unsigned   DEFAULT 0 COMMENT 'Contribution type assigned to paid event registrations for this event. Required if is_monetary is true.',
      is_map tinyint   DEFAULT 0 COMMENT 'Include a map block on the Event Information page when geocode info is available and a mapping provider has been specified?',
-     is_active tinyint   DEFAULT 0 COMMENT 'Is this Event enabled or disabled/cancelled?' 
+     is_active tinyint   DEFAULT 0 COMMENT 'Is this Event enabled or disabled/cancelled?'
 ,
     PRIMARY KEY ( id )
 
-,      INDEX FKEY_domain_id ( domain_id ) ,  
+,      INDEX FKEY_domain_id ( domain_id ) ,
      FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
-  
+
 )  TYPE=InnoDB  ;
 
 
@@ -82,10 +82,10 @@ CREATE TABLE civicrm_event_page (
      default_fee_id int unsigned NOT NULL   COMMENT 'FK to civicrm_custom_option.',
      thankyou_title varchar(255)   DEFAULT NULL COMMENT 'Title for ThankYou page.',
      thankyou_text text    COMMENT 'ThankYou Text.',
-     thankyou_footer_text text    COMMENT 'Footer message.' 
+     thankyou_footer_text text    COMMENT 'Footer message.'
 ,
     PRIMARY KEY ( id )
- 
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -104,15 +104,15 @@ CREATE TABLE civicrm_participant (
      register_date datetime    COMMENT 'When did contact register for event?',
      source varchar(128)    COMMENT 'Source of this event registration.',
      event_level varchar(255)    COMMENT 'Populate with the label (text) associated with a fee level for paid events with multiple levels. Note that we store the label value rather than an FK as the label stored in custom_option may change, but we dont want that to change the label in place at time of this registration.',
-     is_test tinyint   DEFAULT 0  
+     is_test tinyint   DEFAULT 0
 ,
     PRIMARY KEY ( id )
-  
-,      INDEX FKEY_contact_id ( contact_id ) ,  
+
+,      INDEX FKEY_contact_id ( contact_id ) ,
      FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id)
-,      INDEX FKEY_event_id ( event_id ) ,  
+,      INDEX FKEY_event_id ( event_id ) ,
      FOREIGN KEY (event_id) REFERENCES civicrm_event(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -126,13 +126,13 @@ CREATE TABLE civicrm_participant_payment (
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'Participant Payment Id',
      participant_id int unsigned NOT NULL   COMMENT 'Participant Id (FK)',
      payment_entity_table varchar(128)    COMMENT 'Table being referenced for payment entity (expected usage is civicrm_contribution).',
-     payment_entity_id int unsigned NOT NULL   COMMENT 'FK to table with payment record (e.g. civicrm_contribution.id).' 
+     payment_entity_id int unsigned NOT NULL   COMMENT 'FK to table with payment record (e.g. civicrm_contribution.id).'
 ,
     PRIMARY KEY ( id )
-  
-,      INDEX FKEY_participant_id ( participant_id ) ,  
+
+,      INDEX FKEY_participant_id ( participant_id ) ,
      FOREIGN KEY (participant_id) REFERENCES civicrm_participant(id)
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -145,10 +145,10 @@ CREATE TABLE civicrm_currency (
 
      id int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'Currency Id',
      name varchar(64)    COMMENT 'Currency Name',
-     symbol varchar(8)    COMMENT 'Currency Symbol' 
+     symbol varchar(8)    COMMENT 'Currency Symbol'
 ,
     PRIMARY KEY ( id )
-  
+
 )  TYPE=InnoDB  ;
 
 -- /*******************************************************
@@ -174,7 +174,7 @@ CREATE TABLE civicrm_currency (
 -- * civicrm_contact
 -- *
 -- *******************************************************/
-  
+
   ALTER TABLE `civicrm_contact` ADD INDEX `UI_external_identifier` (`external_identifier`);
 
 -- /*******************************************************
@@ -196,7 +196,7 @@ CREATE TABLE civicrm_currency (
 -- /*******************************************************
 -- *
 -- * civicrm_custom_value
--- *  
+-- *
 -- *******************************************************/
 
   ALTER TABLE `civicrm_custom_value` MODIFY float_data double NULL DEFAULT NULL COMMENT 'stores data for ext property data_type = float.';
@@ -228,7 +228,7 @@ CREATE TABLE civicrm_currency (
 
 -- /*******************************************************
 -- *
--- * civicrm_membership_type 
+-- * civicrm_membership_type
 -- *
 -- *******************************************************/
 
@@ -302,12 +302,12 @@ CREATE TABLE civicrm_currency (
 -- *******************************************************/
 
   SELECT @domain_id := id from civicrm_domain;
-  INSERT INTO `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`) 
-  VALUES 
+  INSERT INTO `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`)
+  VALUES
         (@domain_id, 'participant_status', 'Participant Status', 0, 1),
         (@domain_id, 'participant_role', 'Participant Role', 0, 1),
               (@domain_id, 'event_type', 'Event Type', 0, 1);
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_option_value
@@ -317,8 +317,8 @@ CREATE TABLE civicrm_currency (
   SELECT @option_group_id_ps    := max(id) from civicrm_option_group where name = 'participant_status';
   SELECT @option_group_id_pRole := max(id) from civicrm_option_group where name = 'participant_role';
   SELECT @option_group_id_etype := max(id) from civicrm_option_group where name = 'event_type';
-  
-  INSERT INTO `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`) 
+
+  INSERT INTO `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`)
   VALUES
     (@option_group_id_ps, 'Registered', 1, 'Registered', NULL, 0, NULL, 1, NULL, 0, 1, 1),
     (@option_group_id_ps, 'Attended',   2, 'Attended',   NULL, 0, NULL, 2, NULL, 0, 0, 1),
@@ -329,7 +329,7 @@ CREATE TABLE civicrm_currency (
     (@option_group_id_pRole, 'Volunteer', 2, 'Volunteer', NULL, 0, NULL, 2, NULL, 0, 0, 1),
     (@option_group_id_pRole, 'Host',      3, 'Host',      NULL, 0, NULL, 3, NULL, 0, 0, 1),
     (@option_group_id_pRole, 'Speaker',   4, 'Speaker',   NULL, 0, NULL, 4, NULL, 0, 0, 1),
-  
+
     (@option_group_id_etype, 'Conference', 1, 'Conference',  NULL, 0, NULL, 1, NULL, 0, 0, 1 ),
     (@option_group_id_etype, 'Exhibition', 2, 'Exhibition',  NULL, 0, NULL, 2, NULL, 0, 0, 1 ),
     (@option_group_id_etype, 'Fundraiser', 3, 'Fundraiser',  NULL, 0, NULL, 3, NULL, 0, 0, 1 ),
diff --git a/sql/civicrm_upgradedb_v1.8_v1.9_41.mysql b/sql/civicrm_upgradedb_v1.8_v1.9_41.mysql
index 3b5eeec64e..36913abb71 100644
--- a/sql/civicrm_upgradedb_v1.8_v1.9_41.mysql
+++ b/sql/civicrm_upgradedb_v1.8_v1.9_41.mysql
@@ -41,12 +41,12 @@ CREATE TABLE civicrm_mailing_spool (
      job_id int(10) unsigned NOT NULL COMMENT 'The ID of the Job .',
      recipient_email text NULL DEFAULT NULL COMMENT 'The email of the receipients this mail is to be sent.',
      headers text NULL DEFAULT NULL COMMENT 'The header information of this mailing .',
-     body text NULL DEFAULT NULL COMMENT 'The body of this mailing.', 
-     added_at datetime NULL DEFAULT NULL COMMENT 'date on which this job was added.', 
+     body text NULL DEFAULT NULL COMMENT 'The body of this mailing.',
+     added_at datetime NULL DEFAULT NULL COMMENT 'date on which this job was added.',
      removed_at datetime NULL DEFAULT NULL COMMENT 'date on which this job was removed.'
 ,
     PRIMARY KEY ( id )
-,      
+,
      CONSTRAINT FK_civicrm_mailing_spool_domain_id FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id)
 
 ,    CONSTRAINT FK_civicrm_mailing_spool_job_id FOREIGN KEY (job_id) REFERENCES civicrm_mailing_job(id)
@@ -77,44 +77,44 @@ CREATE TABLE civicrm_mailing_spool (
   ALTER TABLE civicrm_payment_processor_type
        DROP INDEX UI_name,
        ADD UNIQUE INDEX UI_name_domain_id( name, domain_id );
-  
+
 
 -- /*******************************************************
 -- *
 -- * civicrm_domain
 -- *
 -- *******************************************************/
-  ALTER TABLE civicrm_domain 
+  ALTER TABLE civicrm_domain
       ADD email_name varchar(255) NULL DEFAULT NULL COMMENT 'The default email name that is used in the from address for all outgoing emails',
             ADD email_address varchar(255) NULL DEFAULT NULL COMMENT 'The default email address that is used as the from address for all outgoing emails',
       DROP contact_name;
 
-    UPDATE `civicrm_domain` SET `email_name`='FIXME';  
-    UPDATE `civicrm_domain` SET `email_address`='info@EXAMPLE.ORG';  
+    UPDATE `civicrm_domain` SET `email_name`='FIXME';
+    UPDATE `civicrm_domain` SET `email_address`='info@EXAMPLE.ORG';
     UPDATE `civicrm_domain` SET `email_domain`='EXAMPLE.ORG';
-  
+
 -- /*******************************************************
 -- *
 -- * civicrm_mailing_job
 -- *
 -- *******************************************************/
-  ALTER TABLE civicrm_mailing_job 
+  ALTER TABLE civicrm_mailing_job
       ADD is_test tinyint(4) DEFAULT 0 COMMENT 'Is this job for a test mail?',
       DROP is_retry;
-        
+
     UPDATE civicrm_mailing_job
     SET    is_test = 0;
-    
+
 
 -- /*******************************************************
 -- *
 -- * civicrm_currency
 -- *
 -- *******************************************************/
-  ALTER TABLE civicrm_currency 
+  ALTER TABLE civicrm_currency
       ADD numeric_code varchar(3) NULL DEFAULT NULL COMMENT 'Numeric currency code',
             ADD full_name varchar(64) NULL DEFAULT NULL COMMENT 'Full currency name';
-           
+
 -- /*******************************************************
 -- *
 -- * civicrm_mailing
@@ -139,7 +139,7 @@ CREATE TABLE civicrm_mailing_spool (
 -- * civicrm_group
 -- *
 -- *******************************************************/
-  ALTER TABLE civicrm_group 
+  ALTER TABLE civicrm_group
       ADD group_type varchar(128) NULL DEFAULT NULL COMMENT 'FK to group type',
             ADD INDEX index_group_type (group_type);
 
@@ -148,7 +148,7 @@ CREATE TABLE civicrm_mailing_spool (
 -- * civicrm_contribution_page
 -- *
 -- *******************************************************/
-  ALTER TABLE civicrm_contribution_page 
+  ALTER TABLE civicrm_contribution_page
       MODIFY default_amount_id int(10) unsigned NULL DEFAULT NULL COMMENT 'FK to civicrm_custom_option.';
 
 -- /*******************************************************
@@ -157,8 +157,8 @@ CREATE TABLE civicrm_mailing_spool (
 -- *
 -- *******************************************************/
 
-  REPLACE 
-      civicrm_currency (id, name, symbol, numeric_code, full_name) 
+  REPLACE
+      civicrm_currency (id, name, symbol, numeric_code, full_name)
   VALUES
     (  1, "AUD",  "$", "036", "Australian Dollar"),
     (  2, "CAD",  "$", "124", "Canadian Dollar"),
@@ -354,15 +354,15 @@ CREATE TABLE civicrm_mailing_spool (
 -- *
 -- *******************************************************/
 
-  INSERT INTO `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`) 
-  VALUES  
+  INSERT INTO `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`)
+  VALUES
         (@domain_id, 'group_type', 'Group Type', 0, 1);
-  
+
 
   SELECT @option_group_id_gType := max(id) from civicrm_option_group where name = 'group_type';
 
-  INSERT INTO 
-     civicrm_option_value (option_group_id, label, value, name, grouping, filter, is_default, weight, description, is_optgroup, is_reserved, is_active) 
+  INSERT INTO
+     civicrm_option_value (option_group_id, label, value, name, grouping, filter, is_default, weight, description, is_optgroup, is_reserved, is_active)
   VALUES
     (@option_group_id_gType, 'Access Control'  , 1, NULL, NULL, 0, NULL, 1, NULL, 0, 1, 1 ),
     (@option_group_id_gType, 'Mailing List'    , 2, NULL, NULL, 0, NULL, 2, NULL, 0, 1, 1 );
@@ -373,9 +373,9 @@ CREATE TABLE civicrm_mailing_spool (
 -- * civicrm_payment_processor_type (new processor plugins)
 -- *
 -- *******************************************************/
-    INSERT INTO 
+    INSERT INTO
         civicrm_payment_processor_type (domain_id, name, title, description, is_active, is_default, user_name_label, password_label, signature_label, subject_label, class_name, url_site_default, url_recur_default, url_button_default, url_site_test_default, url_recur_test_default, url_button_test_default, billing_mode, is_recur )
-    VALUES 
+    VALUES
         (@domain_id,'PayJunction','PayJunction',NULL,1,0,'User Name','Password',NULL,NULL,'Payment_PayJunction','https://payjunction.com/quick_link',NULL,NULL,'https://payjunction.com/quick_link',NULL,NULL,1,0);
 
 
diff --git a/templates/CRM/Admin/Page/Extensions/AddNew.tpl b/templates/CRM/Admin/Page/Extensions/AddNew.tpl
index 1274a773c0..b908533057 100644
--- a/templates/CRM/Admin/Page/Extensions/AddNew.tpl
+++ b/templates/CRM/Admin/Page/Extensions/AddNew.tpl
@@ -1,4 +1,4 @@
-{* 
+{*
 Display a table of remotely-available extensions
 
 Depends: CRM/common/enableDisableApi.tpl and CRM/common/jsortable.tpl
diff --git a/templates/CRM/Badge/Form/Layout.js b/templates/CRM/Badge/Form/Layout.js
index 5586588947..d17751f7b8 100644
--- a/templates/CRM/Badge/Form/Layout.js
+++ b/templates/CRM/Badge/Form/Layout.js
@@ -5,7 +5,7 @@ CRM.$(function($) {
     window.KCFinder = {
       callBack: function(url) {
         field.val(url).change();
-        // calculate the image default width, height 
+        // calculate the image default width, height
         // and assign to respective fields
          var ajaxUrl = CRM.url('civicrm/ajax/rest', 'className=CRM_Badge_Page_AJAX&fnName=getImageProp&json=1&img=' + url);
          $.getJSON(ajaxUrl).done(function ( response ) {
diff --git a/templates/CRM/Badge/Form/Layout.tpl b/templates/CRM/Badge/Form/Layout.tpl
index 3570b66611..b366fb04b6 100644
--- a/templates/CRM/Badge/Form/Layout.tpl
+++ b/templates/CRM/Badge/Form/Layout.tpl
@@ -63,7 +63,7 @@
               {$form.height_image_1.html}</br>{$form.height_image_1.label}
             </td>
            </tr>
-         </table> 
+         </table>
         </td>
       </tr>
       <tr class="crm-badge-layout-form-block-image_2">
@@ -83,7 +83,7 @@
             {$form.height_image_2.html}<br/>{$form.height_image_2.label}
            </td>
           </tr>
-         </table> 
+         </table>
         </td>
       </tr>
       <tr class="crm-badge-layout-form-block-participant_image">
@@ -105,7 +105,7 @@
               {$form.alignment_participant_image.html}</br>{$form.alignment_participant_image.label}
             </td>
            </tr>
-         </table> 
+         </table>
         </td>
       </tr>
       <tr class="crm-badge-layout-form-block-elements">
diff --git a/templates/CRM/Campaign/Page/Petition/SocialNetwork.drupal b/templates/CRM/Campaign/Page/Petition/SocialNetwork.drupal
index 1f76bf6629..f30f5e8dea 100644
--- a/templates/CRM/Campaign/Page/Petition/SocialNetwork.drupal
+++ b/templates/CRM/Campaign/Page/Petition/SocialNetwork.drupal
@@ -7,11 +7,11 @@ if (FB != undefined) { // reprocess the XFBML tags if called in ajax (otherwise,
 </script>
 {/literal}
 
-{* 
+{*
 You might have a specific page that displays more information that the form.
 
-This is an example (taken from http://www.etownhall.eu) that assumes that there is a Drupal node 
-that contains a cck field 'petitionid'. 
+This is an example (taken from http://www.etownhall.eu) that assumes that there is a Drupal node
+that contains a cck field 'petitionid'.
 This node is going to be used for the social networks promotion instead of the form.
 
 This is an example of how to fetch content from a Drupal node (that contains a cck field 'petitionid')
@@ -19,16 +19,16 @@ You will want to customise it based on your configuration.
 
 How to install ?
 Create a custom template folder and copy this file into CRM/Campaign/Page/Petition/SocialNetwork.tpl
-This assumes you are on Drupal, have installed the fb module (drupal.org/project/fb), 
-and in general, is very unlikely to work directly. Please consider this as an example, 
+This assumes you are on Drupal, have installed the fb module (drupal.org/project/fb),
+and in general, is very unlikely to work directly. Please consider this as an example,
 and modify to fit your specific configuration.
 *}
 
 
 {php}
      /**
-     * Function to get Petition Drupal Node Path/Alias 
-     * 
+     * Function to get Petition Drupal Node Path/Alias
+     *
      * @param int $surveyId
      * @static
      */
@@ -39,7 +39,7 @@ and modify to fit your specific configuration.
   $view->set_arguments(array($surveyId));
   $view->build('default'); //use "default" if you want to retrieve the default display of your view, if not, the name of the specific display
   $view->execute();
-  foreach($view->result as $result) { //$result 
+  foreach($view->result as $result) { //$result
     //  Do something with $result here.  Each result is an object, so for example you can access the nid using $result->nid
   }
   */
@@ -48,32 +48,32 @@ and modify to fit your specific configuration.
     // if Drupal node uses cck integer field petitionid
     // there will be a 'content_field_petitionid' table in the Drupal database
     // that stores field_petitionid_value against nid (node id)
-    
+
     $result = db_query("SELECT * FROM content_type_petition WHERE field_petitionid_value = " . $surveyId);
-    
+
     global $base_url;
     $petition = array();
     $data = db_fetch_array ($result);
-  
+
     if (!$data) {
-    return null; 
+    return null;
     }
-  
+
     $petition_node = node_load ($data['nid']);
     $petition_node->url = $base_url . "/" . drupal_get_path_alias("node/".$data['nid']);
     $petition_node->title = node_page_title(node_load($data['nid']));
-      
+
     return array_merge ((array)$petition_node,(array)$data);
   }
 
   global $base_url;
-  $this->assign('base_url', $base_url);  
+  $this->assign('base_url', $base_url);
   $email = $this->get_template_vars('email');
   $noscript = $this->get_template_vars('noscript');
   $petition_id = $this->get_template_vars('petition_id');
   $node = getPetitionDrupalNodeData($petition_id);
   $this->assign_by_ref('node', $node);
-  
+
 {/php}
 
 {if $node.nid}
@@ -88,7 +88,7 @@ and modify to fit your specific configuration.
   <h3>Do you use Facebook or Twitter ?</h3>
 
   <div class="socialnetwork">
-  {if $noscript}  
+  {if $noscript}
     <p>Share it on Facebook or tweet it on Twitter.</p>
     <a href="http://www.facebook.com/sharer.php?u={$node.url}&amp;t={$node.title}">
       <img src="{$base_url}/sites/all/modules/civicrm/i/fbshare.png" width="70px" height="28px" title="Facebook Share Button">
@@ -99,9 +99,9 @@ and modify to fit your specific configuration.
     &nbsp;
     <a href="http://twitter.com/share?url={$node.url}&amp;text=Sign this, I did: {$node.title}">
       <img src="{$base_url}/sites/all/modules/civicrm/i/tweet.png" width="55px" height="20px"  title="Tweet Button"">
-    </a>      
-  {else}    
-    <p>Like it on Facebook or tweet it on Twitter.</p>  
+    </a>
+  {else}
+    <p>Like it on Facebook or tweet it on Twitter.</p>
     <fb:like href="{$node.url}"></fb:like>
     <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
     <a href="http://twitter.com/share?url={$node.url}&text=Sign this, I did: {$node.title}" class="twitter-share-button" title="tweet about this petition">Tweet</a>
diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl
index 010778b3ae..783d68342c 100644
--- a/templates/CRM/Case/Form/CaseView.tpl
+++ b/templates/CRM/Case/Form/CaseView.tpl
@@ -230,7 +230,7 @@
             "success": fnCallback
           });
         }
-      });   
+      });
     }
 
     function setCaseRolesSelectorClass( ) {
@@ -321,7 +321,7 @@
            "success": fnCallback
          });
        }
-     });   
+     });
    }
 
    function setClientRelationshipsSelectorClass( ) {
diff --git a/templates/CRM/Contact/Form/Edit/Address/country_state_province.tpl b/templates/CRM/Contact/Form/Edit/Address/country_state_province.tpl
index dda1ab5599..7738cb5677 100644
--- a/templates/CRM/Contact/Form/Edit/Address/country_state_province.tpl
+++ b/templates/CRM/Contact/Form/Edit/Address/country_state_province.tpl
@@ -32,7 +32,7 @@
         {$form.address.$blockId.country_id.html}
      </td>
    {/if}
-   {if !empty($form.address.$blockId.state_province_id)} 
+   {if !empty($form.address.$blockId.state_province_id)}
      <td>
         {$form.address.$blockId.state_province_id.label}<br />
         {$form.address.$blockId.state_province_id.html}
diff --git a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
index 7224f9b771..83f92b8344 100644
--- a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
+++ b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
@@ -106,7 +106,7 @@ CRM.$(function($) {
     <div class="icon inform-icon"></div>&nbsp;{ts}You will not be able to send an automatic email receipt for this payment because there is no email address recorded for this contact. If you want a receipt to be sent when this payment is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the payment.{/ts}
   </div>
   {/if}
-  <table class="form-layout">    
+  <table class="form-layout">
     <tr>
       <td class="font-size12pt label"><strong>{ts}Participant{/ts}</strong></td><td class="font-size12pt"><strong>{$displayName}</strong></td>
     </tr>
@@ -122,9 +122,9 @@ CRM.$(function($) {
        <td class="label">{ts}Current Selections{/ts}</td>
        <td>{include file="CRM/Price/Page/LineItem.tpl" context="Event"}</td>
      </tr>
-  {/if} 
+  {/if}
   </table>
-  
+
   {if $priceSet.fields}
     <fieldset id="priceset" class="crm-group priceset-group">
       <table class='form-layout'>
@@ -134,7 +134,7 @@ CRM.$(function($) {
         </tr>
      {if $paymentInfo}
        <tr><td></td><td>
-         <div class='crm-section'> 
+         <div class='crm-section'>
          <div class='label'>{ts}Updated Fee(s){/ts}</div><div id="pricevalue" class='content updated-fee'></div>
          <div class='label'>{ts}Total Paid{/ts}</div>
          <div class='content'>
@@ -144,7 +144,7 @@ CRM.$(function($) {
          <div class='label'><strong>{ts}Balance Owed{/ts}</strong></div><div class='content'><strong id='balance-fee'></strong></div>
           </div>
        {include file='CRM/Price/Form/Calculate.tpl' currencySymbol=$currencySymbol noCalcValueDisplay='false' displayOveride='true'}
-       {/if}    
+       {/if}
       </table>
     </fieldset>
   {/if}
@@ -203,7 +203,7 @@ CRM.$(function($) {
 <script type='text/javascript'>
 CRM.$(function($) {
   var $form = $('form.{/literal}{$form.formClass}{literal}');
-  cj('.total_amount-section').remove(); 
+  cj('.total_amount-section').remove();
 
   cj($form).submit(function(e) {
     var partiallyPaid = {/literal}{$partiallyPaid}{literal};
diff --git a/tests/fixtures/contacts.yaml b/tests/fixtures/contacts.yaml
index 905ab8e9e1..10c1e7717e 100644
--- a/tests/fixtures/contacts.yaml
+++ b/tests/fixtures/contacts.yaml
@@ -2,89 +2,89 @@ civicrm_contact:
   -
     id: 3
     contact_type: Individual
-    contact_sub_type:            
-    do_not_email:            
-    do_not_phone:            
-    do_not_mail:            
-    do_not_sms:            
-    do_not_trade:            
+    contact_sub_type:
+    do_not_email:
+    do_not_phone:
+    do_not_mail:
+    do_not_sms:
+    do_not_trade:
     is_opt_out: 0
-    legal_identifier:            
-    external_identifier:            
+    legal_identifier:
+    external_identifier:
     sort_name: Site Administrator
     display_name: Site Administrator
-    nick_name: 
-    legal_name: 
-    image_URL: 
-    preferred_communication_method: 
-    preferred_mail_format: 
-    hash: 
-    api_key: 
-    source: 
+    nick_name:
+    legal_name:
+    image_URL:
+    preferred_communication_method:
+    preferred_mail_format:
+    hash:
+    api_key:
+    source:
     first_name: Site
-    middle_name: 
+    middle_name:
     last_name: Administrator
-    prefix_id: 
-    suffix_id: 
-    email_greeting_id: 
-    email_greeting_custom: 
-    postal_greeting_id: 
-    postal_greeting_custom: 
-    addressee_id: 
-    addressee_custom: 
-    job_title: 
-    gender_id: 
-    birth_date: 
-    is_deceased: 
-    deceased_date: 
-    household_name: 
-    primary_contact_id: 
-    organization_name: 
-    sic_code: 
-    user_unique_id: 
-    employer_id: 
+    prefix_id:
+    suffix_id:
+    email_greeting_id:
+    email_greeting_custom:
+    postal_greeting_id:
+    postal_greeting_custom:
+    addressee_id:
+    addressee_custom:
+    job_title:
+    gender_id:
+    birth_date:
+    is_deceased:
+    deceased_date:
+    household_name:
+    primary_contact_id:
+    organization_name:
+    sic_code:
+    user_unique_id:
+    employer_id:
 
   -
     id: 17
     contact_type: Individual
-    contact_sub_type:            
-    do_not_email:            
-    do_not_phone:            
-    do_not_mail:            
-    do_not_sms:            
-    do_not_trade:            
+    contact_sub_type:
+    do_not_email:
+    do_not_phone:
+    do_not_mail:
+    do_not_sms:
+    do_not_trade:
     is_opt_out: 0
-    legal_identifier:            
-    external_identifier:            
-    sort_name:                      
+    legal_identifier:
+    external_identifier:
+    sort_name:
     display_name: Test Contact
-    nick_name: 
-    legal_name: 
-    image_URL: 
-    preferred_communication_method: 
-    preferred_mail_format: 
-    hash: 
-    api_key: 
-    source: 
+    nick_name:
+    legal_name:
+    image_URL:
+    preferred_communication_method:
+    preferred_mail_format:
+    hash:
+    api_key:
+    source:
     first_name: Test
-    middle_name: 
+    middle_name:
     last_name: Contact
-    prefix_id: 
-    suffix_id: 
-    email_greeting_id: 
-    email_greeting_custom: 
-    postal_greeting_id: 
-    postal_greeting_custom: 
-    addressee_id: 
-    addressee_custom: 
-    job_title: 
-    gender_id: 
-    birth_date: 
+    prefix_id:
+    suffix_id:
+    email_greeting_id:
+    email_greeting_custom:
+    postal_greeting_id:
+    postal_greeting_custom:
+    addressee_id:
+    addressee_custom:
+    job_title:
+    gender_id:
+    birth_date:
     is_deceased: 0
-    deceased_date: 
-    household_name: 
-    primary_contact_id: 
-    organization_name: 
-    sic_code: 
-    user_unique_id: 
-    employer_id: 
+    deceased_date:
+    household_name:
+    primary_contact_id:
+    organization_name:
+    sic_code:
+    user_unique_id:
+    employer_id:
diff --git a/tests/phpunit/CRM/Core/BAO/RecurringEntityTest.php b/tests/phpunit/CRM/Core/BAO/RecurringEntityTest.php
index 2d888bc297..aa26aec5dc 100644
--- a/tests/phpunit/CRM/Core/BAO/RecurringEntityTest.php
+++ b/tests/phpunit/CRM/Core/BAO/RecurringEntityTest.php
@@ -52,7 +52,7 @@ class CRM_Core_BAO_RecurringEntityTest extends CiviUnitTestCase {
   protected function setUp() {
     parent::setUp();
   }
-  
+
   /**
    * Tears down the fixture, for example, closes a network connection.
    * This method is called after a test is executed.
@@ -86,13 +86,13 @@ class CRM_Core_BAO_RecurringEntityTest extends CiviUnitTestCase {
       'used_for'            => 'activity'
     );
 
-    $generatedEntities = $recursion->generate(); 
+    $generatedEntities = $recursion->generate();
     $this->assertEquals(5, count($generatedEntities['civicrm_activity']), "Cehck if number of iterations are 5");
     $expectedDates = array(
-      '20141025103000', 
-      '20141227103000', 
-      '20150328103000', 
-      '20150627103000', 
+      '20141025103000',
+      '20141227103000',
+      '20150328103000',
+      '20150627103000',
       '20150926103000'
     );
     foreach ($generatedEntities['civicrm_activity'] as $entityID) {
@@ -117,9 +117,9 @@ class CRM_Core_BAO_RecurringEntityTest extends CiviUnitTestCase {
     }
     $resultDates = array_diff($actualDates, $expectedDates);
     $this->assertEquals(0, count($resultDates), "Check if all the value in expected array matches actual array");
-    
+
   }
-  
+
   /**
    * Testing Event Generation through Entity Recursion
    */
@@ -135,7 +135,7 @@ class CRM_Core_BAO_RecurringEntityTest extends CiviUnitTestCase {
     $daoEvent->is_active = 1;
     $daoEvent->save();
     $this->assertDBNotNull('CRM_Event_DAO_Event', $daoEvent->id, 'id', 'id', 'Check DB if event was created');
-    
+
     //Create tell a friend for event
     $daoTellAFriend = new CRM_Friend_DAO_Friend();
     $daoTellAFriend->entity_table = 'civicrm_event';
@@ -164,17 +164,17 @@ class CRM_Core_BAO_RecurringEntityTest extends CiviUnitTestCase {
       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'),
         'isRecurringEntityRecord' => TRUE,
       ),
     );
-    
+
     $interval = $recursion->getInterval($daoEvent->start_date, $daoEvent->end_date);
     $recursion->intervalDateColumns = array('end_date' => $interval);
-    $generatedEntities = $recursion->generate(); 
+    $generatedEntities = $recursion->generate();
     $this->assertArrayHasKey('civicrm_event', $generatedEntities, 'Check if generatedEntities has civicrm_event as required key');
     $expectedDates = array(
       '20141027103000' => '20141029103000',
@@ -182,7 +182,7 @@ class CRM_Core_BAO_RecurringEntityTest extends CiviUnitTestCase {
       '20141110103000' => '20141112103000',
       '20141117103000' => '20141119103000'
     );
-    
+
     $this->assertCount($recursion->schedule['start_action_offset'], $generatedEntities['civicrm_event'], 'Check if the number of events created are right');
     $actualDates = array();
     foreach($generatedEntities['civicrm_event'] as $key => $val) {
@@ -191,16 +191,16 @@ class CRM_Core_BAO_RecurringEntityTest extends CiviUnitTestCase {
       $endDate = date('YmdHis', strtotime(CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $val, 'end_date', 'id')));
       $actualDates[$startDate] = $endDate;
     }
-    
+
     $resultDates = array_diff($actualDates, $expectedDates);
     $this->assertEquals(0, count($resultDates), "Check if all the value in expected array matches actual array");
-    
+
     foreach($generatedEntities['civicrm_tell_friend'] as $key => $val) {
       $this->assertDBNotNull('CRM_Friend_DAO_Friend', $val, 'id', 'id', 'Check if friends were created in loop');
       $this->assertDBCompareValue('CRM_Friend_DAO_Friend', $val, 'entity_id', 'id', $generatedEntities['civicrm_event'][$key], 'Check DB if correct FK was maintained with event for Friend');
     }
     $this->assertCount($recursion->schedule['start_action_offset'], $generatedEntities['civicrm_tell_friend'], 'Check if the number of tell a friend records are right');
-    
+
     // set mode to ALL, i.e any change to changing event affects all related recurring activities
     $recursion->mode(3);
 
diff --git a/tests/phpunit/WebTest/Contribute/UpdateContributionTest.php b/tests/phpunit/WebTest/Contribute/UpdateContributionTest.php
index 244c06c72c..d45df49d24 100755
--- a/tests/phpunit/WebTest/Contribute/UpdateContributionTest.php
+++ b/tests/phpunit/WebTest/Contribute/UpdateContributionTest.php
@@ -166,7 +166,7 @@ class WebTest_Contribute_UpdateContributionTest extends CiviSeleniumTestCase {
    //click through to the Contribution edit screen
    $contId = $this->urlArg('id', $this->getAttribute("xpath=//div[@class='view-content']//table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='Edit']@href"));
    $this->clickAjaxLink("xpath=//div[@class='view-content']//table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='Edit']", "product_name_0");
-   
+
    $this->select('product_name_0', "label=$premiumName2 ( $sku2 )");
    // Clicking save.
    $this->clickAjaxLink("_qf_Contribution_upload", "xpath=//div[@class='view-content']//table[@class='selector row-highlight']//tbody/tr[1]/td[7][text()='$premiumName2']");
diff --git a/tools/scripts/release-testing/upgrader.sh.txt b/tools/scripts/release-testing/upgrader.sh.txt
index b4ac387f01..0e9a778461 100644
--- a/tools/scripts/release-testing/upgrader.sh.txt
+++ b/tools/scripts/release-testing/upgrader.sh.txt
@@ -50,8 +50,8 @@ Simple release test is located in scripts/release-testing/simpleupgradetest.sh
 Step by step description:
 * good idea to run-checks at the beginning to make sure all the stuff is set up correctly
 * first two lines: cleans up databases for upgrade testing installation and removes CiviCRM files (in case they weren't cleaned up from previous runs) for upgrade testing installation
-* installs start version (3.3.0 in above case) - 
-* upgrades 3.3.0 to 3.4.1 
+* installs start version (3.3.0 in above case) -
+* upgrades 3.3.0 to 3.4.1
 
 
 h3. Upgraded database schema verification
@@ -192,7 +192,7 @@ function run-checks {
         errecho "Tarball: \""$FILENAME"\" doesn't exist or is not readable."
         CHECKS=1
     fi
-    
+
     if [ $ACTION == "upgrade" ] && [ ! -r $FILENAME ] ; then
         errecho "Tarball: \""$FILENAME"\" doesn't exist or is not readable."
         CHECKS=1
@@ -251,7 +251,7 @@ function run-checks {
 
 function run-upgrade-scenario {
     upgecho "Running upgrade scenario tests."
-    echo "*** Take it away, Sebastian! "    
+    echo "*** Take it away, Sebastian! "
     echo
     cd $PHPUNITSCRIPTDIR
     $PHPUNITCOMMAND $PU_UPGRADETEST
@@ -260,16 +260,16 @@ function run-upgrade-scenario {
 
 function run-install-scenario {
     upgecho "Running install scenario tests."
-    echo "*** Take it away, Sebastian! "    
+    echo "*** Take it away, Sebastian! "
     echo
     cd $PHPUNITSCRIPTDIR
     $PHPUNITCOMMAND $PU_INSTALLTEST
-    echo   
+    echo
 }
 
 function run-tests {
     upgecho "Running post upgrade tests."
-    echo "*** Take it away, Sebastian! "    
+    echo "*** Take it away, Sebastian! "
     echo
     cd $PHPUNITSCRIPTDIR
     $PHPUNITCOMMAND $PU_SUITE
@@ -290,7 +290,7 @@ function remove-files {
 }
 
 function remove-settings {
-    upgecho "Removing civicrm.settings.php. ($SETTINGSDIR/civicrm.settings.php is gone!)"    
+    upgecho "Removing civicrm.settings.php. ($SETTINGSDIR/civicrm.settings.php is gone!)"
     rm -rf $SETTINGSDIR"/civicrm.settings.php"
 }
 
@@ -357,12 +357,12 @@ case $ACTION in
     ;;
 
     dumpschema-cividb)
-        run-checks 0    
+        run-checks 0
         dump-schema $FILENAME
     ;;
 
     tests)
-        run-checks 0    
+        run-checks 0
         run-tests
     ;;
 esac
diff --git a/tools/templates/CRM/Auction/Form/Auction.tpl b/tools/templates/CRM/Auction/Form/Auction.tpl
index 315e6f6971..60334e1956 100644
--- a/tools/templates/CRM/Auction/Form/Auction.tpl
+++ b/tools/templates/CRM/Auction/Form/Auction.tpl
@@ -23,7 +23,7 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-<div class="form-item"> 
+<div class="form-item">
 <fieldset><legend>{ts}Auction Information{/ts}</legend>
     <table class="form-layout-compressed">
          <tr><td class="label">{$form.title.label}</td><td>{$form.title.html}</td></tr>
@@ -50,12 +50,12 @@
 
          <tr><td>&nbsp;</td><td>{$form.is_item_approval.html} {$form.is_item_approval.label}<br />
          <tr><td>&nbsp;</td><td>{$form.is_item_groups.html} {$form.is_item_groups.label}<br />
-         <tr><td>&nbsp;</td><td>{$form.is_active.html} {$form.is_active.label}</td></tr> 
+         <tr><td>&nbsp;</td><td>{$form.is_active.html} {$form.is_active.label}</td></tr>
 
         <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
     </table>
-    <dl>    
-       <dt></dt><dd class="html-adjust">{$form.buttons.html}</dd>   
-    </dl> 
-</fieldset>     
+    <dl>
+       <dt></dt><dd class="html-adjust">{$form.buttons.html}</dd>
+    </dl>
+</fieldset>
 </div>
diff --git a/tools/templates/CRM/Auction/Page/Item.tpl b/tools/templates/CRM/Auction/Page/Item.tpl
index 34703b9892..ad2261a096 100644
--- a/tools/templates/CRM/Auction/Page/Item.tpl
+++ b/tools/templates/CRM/Auction/Page/Item.tpl
@@ -23,15 +23,19 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-{if $manageItemURL}<a accesskey="N" href="{$manageItemURL}" id="manageItem" class="button"><span>&raquo; {ts}Manage Items{/ts}</span></a><br/><br/>{/if}
+{if $manageItemURL}<a accesskey="N" href="{$manageItemURL}" id="manageItem" class="button">
+  <span>&raquo; {ts}Manage Items{/ts}</span></a>
+  <br/>
+  <br/>
+{/if}
 
 {include file="CRM/Auction/Form/SearchItem.tpl"}
 
 {if $rows}
-    <div id=item_status_id>
-        {strip}
-        {include file="CRM/common/pager.tpl" location="top"}
-        {include file="CRM/common/pagerAToZ.tpl}
+  <div id=item_status_id>
+  {strip}
+    {include file="CRM/common/pager.tpl" location="top"}
+    {include file="CRM/common/pagerAToZ.tpl}
         <table class="selector">
          <tr class="columnheader">
             <th></th>
@@ -45,41 +49,41 @@
           <tr class="{cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
             <td><img src="{$config->resourceBase}i/contribute/default_premium.jpg" width="70px" height="50px"/></td>
             <td>{$row.title}</td>
-            <td>{$row.max_bid|crmMoney}</td>
-            <td>{if $row.buy_now_value}{$row.buy_now_value|crmMoney} &nbsp;&raquo; <a href="#">buy now</a>{/if}</td>
-            <td>{$row.retail_value|crmMoney}</td>
-            <td>{$row.bid_end_date|crmDate}</td>
-          </tr>
-        {/foreach}
-        </table>
-        {include file="CRM/common/pager.tpl" location="bottom"}
-        {/strip}
+  <td>{$row.max_bid|crmMoney}</td>
+  <td>{if $row.buy_now_value}{$row.buy_now_value|crmMoney} &nbsp;&raquo; <a href="#">buy now</a>{/if}</td>
+  <td>{$row.retail_value|crmMoney}</td>
+  <td>{$row.bid_end_date|crmDate}</td>
+  </tr>
+  {/foreach}
+  </table>
+    {include file="CRM/common/pager.tpl" location="bottom"}
+  {/strip}
 
-    </div>
+</div>
 {else}
-   {if $isSearch eq 1}
-    <div class="status messages">
-        <dl>
-            <dt><div class="icon inform-icon"></div></dt>
-            {capture assign=browseURL}{crmURL p='civicrm/auction/manage' q="reset=1"}{/capture}
-            <dd>
-                {ts}No available Auctions match your search criteria. Suggestions:{/ts}
-                <div class="spacer"></div>
-                <ul>
-                <li>{ts}Check your spelling.{/ts}</li>
-                <li>{ts}Try a different spelling or use fewer letters.{/ts}</li>
-                <li>{ts}Make sure you have enough privileges in the access control system.{/ts}</li>
-                </ul>
-                {ts 1=$browseURL}Or you can <a href='%1'>browse all available Current Auctions</a>.{/ts}
-            </dd>
-        </dl>
-    </div>
-   {else}
-    <div class="messages status">
-    <dl>
-        <dt><div class="icon inform-icon"></div></dt>
-        <dd>{ts 1=$newAuctionURL}There are no auctions created yet. You can <a href='%1'>add one</a>.{/ts}</dd>
-        </dl>
-    </div>
-   {/if}
+  {if $isSearch eq 1}
+  <div class="status messages">
+  <dl>
+  <dt><div class="icon inform-icon"></div></dt>
+    {capture assign=browseURL}{crmURL p='civicrm/auction/manage' q="reset=1"}{/capture}
+  <dd>
+    {ts}No available Auctions match your search criteria. Suggestions:{/ts}
+  <div class="spacer"></div>
+  <ul>
+  <li>{ts}Check your spelling.{/ts}</li>
+  <li>{ts}Try a different spelling or use fewer letters.{/ts}</li>
+  <li>{ts}Make sure you have enough privileges in the access control system.{/ts}</li>
+  </ul>
+    {ts 1=$browseURL}Or you can <a href='%1'>browse all available Current Auctions</a>.{/ts}
+  </dd>
+  </dl>
+  </div>
+  {else}
+  <div class="messages status">
+  <dl>
+  <dt><div class="icon inform-icon"></div></dt>
+  <dd>{ts 1=$newAuctionURL}There are no auctions created yet. You can <a href='%1'>add one</a>.{/ts}</dd>
+  </dl>
+  </div>
+  {/if}
 {/if}
diff --git a/xml/schema/Case/CaseContact.xml b/xml/schema/Case/CaseContact.xml
index da3c773b6b..218dbcce41 100644
--- a/xml/schema/Case/CaseContact.xml
+++ b/xml/schema/Case/CaseContact.xml
@@ -39,7 +39,7 @@
       <comment>Contact ID of contact record given case belongs to.</comment>
       <html>
         <type>Autocomplete-Select</type>
-      </html>      
+      </html>
       <add>2.1</add>
   </field>
   <foreignKey>
diff --git a/xml/schema/Core/RecurringEntity.xml b/xml/schema/Core/RecurringEntity.xml
index 85ade12b28..f90c5e4092 100644
--- a/xml/schema/Core/RecurringEntity.xml
+++ b/xml/schema/Core/RecurringEntity.xml
@@ -11,7 +11,7 @@
       <title>ID</title>
       <type>int unsigned</type>
       <length>10</length>
-      <required>true</required>      
+      <required>true</required>
       <add>4.6</add>
   </field>
   <primaryKey>
diff --git a/xml/templates/case_sample.tpl b/xml/templates/case_sample.tpl
index e069bbdbf4..f44a65d006 100644
--- a/xml/templates/case_sample.tpl
+++ b/xml/templates/case_sample.tpl
@@ -59,7 +59,7 @@ INSERT INTO `civicrm_option_value` ( `option_group_id`, `label`, `value`, `name`
 INSERT INTO `civicrm_option_value` ( `option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`, `component_id` )
 (SELECT @option_group_id_activity_type, 'ADC referral', (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/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index c637c5ab3d..f95e4532ca 100644
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -314,7 +314,7 @@ VALUES
    (@option_group_id_act, '{ts escape="sql"}Tell a Friend{/ts}',                      9, 'Tell a Friend',       NULL, 1, NULL, 9, '{ts escape="sql"}Send information about a contribution campaign or event to a friend.{/ts}', 0, 1, 1, NULL, NULL),
    (@option_group_id_act, '{ts escape="sql"}Pledge Acknowledgment{/ts}',              10, 'Pledge Acknowledgment',  NULL, 1, NULL, 10, '{ts escape="sql"}Send Pledge Acknowledgment.{/ts}',                                     0, 1, 1, @pledgeCompId, NULL),
    (@option_group_id_act, '{ts escape="sql"}Pledge Reminder{/ts}',                    11, 'Pledge Reminder',    NULL, 1, NULL, 11, '{ts escape="sql"}Send Pledge Reminder.{/ts}',                                               0, 1, 1, @pledgeCompId, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Inbound Email{/ts}',                      12, 'Inbound Email',      NULL, 1, NULL, 12, '{ts escape="sql"}Inbound Email.{/ts}',                                                      0, 1, 1, NULL, NULL),   
+   (@option_group_id_act, '{ts escape="sql"}Inbound Email{/ts}',                      12, 'Inbound Email',      NULL, 1, NULL, 12, '{ts escape="sql"}Inbound Email.{/ts}',                                                     0, 1, 1, NULL, NULL),
 
 -- Activity Types for case activities
    (@option_group_id_act, '{ts escape="sql"}Open Case{/ts}',          13, 'Open Case',          NULL, 0,  0, 13, '', 0, 1, 1, @caseCompId, NULL),
@@ -365,7 +365,7 @@ VALUES
    (@option_group_id_act, '{ts escape="sql"}Inbound SMS{/ts}',  45, 'Inbound SMS', NULL, 1, NULL,  45, '{ts escape="sql"}Inbound SMS{/ts}', 0, 1, 1, NULL, NULL),
 
 
- -- Activity types for particial payment   
+ -- Activity types for particial payment
    (@option_group_id_act, '{ts escape="sql"}Payment{/ts}', 46, 'Payment', NULL, 1, NULL, 46, '{ts escape="sql"}Additional payment recorded for event or membership fee.{/ts}', 0, 1, 1, @contributeCompId, NULL),
    (@option_group_id_act, '{ts escape="sql"}Refund{/ts}', 47, 'Refund', NULL, 1, NULL, 47, '{ts escape="sql"}Refund recorded for event or membership fee.{/ts}', 0, 1, 1, @contributeCompId, NULL),
 
diff --git a/xml/templates/message_templates/contribution_invoice_receipt_subject.tpl b/xml/templates/message_templates/contribution_invoice_receipt_subject.tpl
index 0035d669ed..6cb6bf1a02 100644
--- a/xml/templates/message_templates/contribution_invoice_receipt_subject.tpl
+++ b/xml/templates/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/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl
index 45f339420f..039b659f54 100644
--- a/xml/templates/message_templates/membership_offline_receipt_html.tpl
+++ b/xml/templates/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/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl
index 6fc789a6b4..b4d8619b2f 100644
--- a/xml/templates/message_templates/membership_online_receipt_html.tpl
+++ b/xml/templates/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/xml/templates/message_templates/participant_confirm_html.tpl b/xml/templates/message_templates/participant_confirm_html.tpl
index 87a921cbdc..b1a5aa349c 100644
--- a/xml/templates/message_templates/participant_confirm_html.tpl
+++ b/xml/templates/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/xml/templates/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl b/xml/templates/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl
index 4300512abe..bddc84c855 100644
--- a/xml/templates/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl	
+++ b/xml/templates/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/xml/templates/message_templates/sample/Sample Responsive Design Newsletter - Two Column.tpl b/xml/templates/message_templates/sample/Sample Responsive Design Newsletter - Two Column.tpl
index 216ab36647..5181c7a491 100644
--- a/xml/templates/message_templates/sample/Sample Responsive Design Newsletter - Two Column.tpl	
+++ b/xml/templates/message_templates/sample/Sample Responsive Design Newsletter - Two Column.tpl	
@@ -60,10 +60,10 @@
 
      @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>
-- 
2.25.1