CRM-15036 - force emailed social media image URLs to use HTTP.

----------------------------------------
* CRM-15036: Social media image URLs should always use HTTP in emails
  https://issues.civicrm.org/jira/browse/CRM-15036
CRM-15056 - Workaround for civicrm_worldregion bug in search builder
Merge pull request #3752 from colemanw/wr

CRM-15056 - Workaround for civicrm_worldregion bug in search builder
CRM-14912 support import matching with external ID
CRM-15041 fix - View Event Registration / Change Selections : Total Paid and Balance are incorrect after a contribution is recorded for Pay-later registrations

https://issues.civicrm.org/jira/browse/CRM-15041
CRM-15068 - Add api support for custom file fields
Merge pull request #3775 from colemanw/file

CRM-15068 - Add api support for custom file fields
Update Contribution.php

Fix regression that was causing Event Resets with Offline Contributions to be garbled.  Detailed in CRM-15069
Wrapped some unlocalised elements in ts-tags
Merge pull request #3734 from wellebee/CRM-15036

CRM-15036 - force emailed social media image URLs to use HTTP.
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-04-22-25-32

Conflicts:
	CRM/Utils/Type.php
Merge pull request #3779 from anttiviljami/master

Wrapped some unlocalised elements in ts-tags
Merge pull request #3776 from crusonweb/patch-3

Update Contribution.php
CRM test Fix 4.5beta5
Merge pull request #3782 from jitendrapurohit/CRM-Test-4.5beta5

CRM test Fix 4.5beta5 For ActivityTest
API Test Fix
Merge pull request #3765 from lcdservices/CRM-14912

CRM-14912 support import matching with external ID
Send email js fixes and cleanup
Email code cleanup
Billing Name saved as Participant Name Fix