Conflicts:
	CRM/Contribute/Page/Tab.php

CRM-14501 - Fix CRM_Contact_BAO_Relationship::getPermissionedContacts so...

CRM-14047 - add clarification text to Total Fee(s) display

CRM-13606 - Include / Exclude custom Search does not work properly

fix the broken link to view all the contributions for a contact, CRM-125...

CRM-13833 related fix 

CRM-13926 new changess

CRM-14036_fix

CRM-14037 fix -  Class 'CRM_Activity_BAO_Contact' not found /civicrm/CRM/Activity/BAO/Activity.php DLTK Problem

CRM-12753, advanced search, change log fixes

Merge branch 4.4 into master

Ajax form improvements

CRM_Utils_Hook_Joomla - Fix error loading JPluginHelper in Joomla 3.2

The missing newlines were causing SQL loading to crash in Joomla.

CRM-14021 respect for .extra.hlp files & for alterations in help page vi...

CRM-12753 - Add Created date to contact view footer.

----------------------------------------
* CRM-12753: Searching for contacts by date created
  http://issues.civicrm.org/jira/browse/CRM-12753

CRM-14054 - Contribution Thank You Letters - Set 'update thank-you date' to checked

http://issues.civicrm.org/jira/browse/CRM-13833

CRM-13995 - Add is_object check to prevent notices.

----------------------------------------
* CRM-13995: contact export when merging households: some household fields missing
  http://issues.civicrm.org/jira/browse/CRM-13995

CRM -13995 - Additional change needed to get Country column exported for merge into h...

CRM-13995 fix export when merging households