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-15068 - Add api support for custom file fields
Merge pull request #3775 from colemanw/file

CRM-15068 - Add api support for custom file fields
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-04-22-25-32

Conflicts:
	CRM/Utils/Type.php