remove failing whitespaces preparatory to fixing backport
fix double } in backport
CRM-14856 - CRM_Profile_Form - Load postURL and add_to_group from DB (instead of POST)

Also:
 * Keep & use a single copy of the UFGroup in $this->_ufGroup.
 * Retain "gid" as a hidden field (for use in POST-backs).

Conflicts:
	CRM/Profile/Form.php
	CRM/Profile/Form/Edit.php
backport various hooks
CRM-14856 - CRM_Profile_Form_Edit - Reimplement cancelURL

Conflicts:
	CRM/Profile/Form/Edit.php
CRM-14657 fix backport - variable name had changed
add drupal folder to d7 version

drupal updates from 4.2.2

4.2.4 drupal upgrade changes

4.2.7 drupal folder updates
Add mysql timezone support
CRM-11543 - Fix Drupal 7 rules module so that permission to view admin form is available

CRM-11544 - Drupal Rules 7 - incorrect permissions checks
change views hook to use alter
Confirmed CRM-11017 fix relationship filter
fixes to walklist (in 4.3)
CRM-11838 ETA 4.3 Force civicrm_member_roles to reload user object before saving (CRM-11838).
CRM-12009 Fix views filtering on tag name, group title.
CRM-12207 Set preferred_communications_method to use pseudoconstant handler.
CRM-11908 ET 4.3 OG sync stuff d7 / OG2

CiviCRM OG Sync doesn't support the currently recommended release of
Organic Groups for D7
Join civicrm_contact to civicrm_uf_match table for views (CRM-12836).
CRM-13081 Allow joining to the civicrm_relationship table via either contact_id_a or contact_id_b.
CRM-12593. 'CiviCRM Contacts: Drupal ID' fails for chained relationships.
Restore old views relationship join.