CRM-14200: Tell a friend i18n translation dialog/popups fix.
fixed activity count bug, CRM-14175

----------------------------------------
* CRM-14175: activity tab on contact summary is super slow
  http://issues.civicrm.org/jira/browse/CRM-14175
templates/CRM/Friend/Form/Friend.tpl: fix the thank_you_title/message field i18n.
CRM/Contribute/Form/Contribution/Main.php: Fix ts() usage for PCP string.
Merge pull request #2508 from mlutfy/4.4-ts-pcp

CRM/Contribute/Form/Contribution/Main.php: Fix ts() usage for PCP string.
http://issues.civicrm.org/jira/browse/CRM-14205
Merge pull request #2501 from kurund/CRM-14175

fixed activity count bug, CRM-14175
Merge pull request #2499 from mlutfy/4.4-crm14200

CRM-14200: Tell a friend i18n translation dialog/popups fix.
HR-268 - Activity API - Extract necessary bits so that we re-use in alternative "get" implementation
CRM-14196 - Fix export of non-primary phone numbers
Merge pull request #2511 from colemanw/4.4

CRM-14196 - Fix export of non-primary phone numbers
Merge pull request #2509 from totten/4.4-HR-268

HR-268 - Activity API - Extract necessary bits so that we re-use in...
Reorganize and update api examples
CRM-14208 support new joomla authentication method
CRM-14208, CRM-14140 use more of jsproffitt patch to simplify logic
Merge pull request #2512 from lcdservices/CRM-14208

CRM-14208
updated examples
Merge pull request #2517 from eileenmcnaughton/examples

Examples
CRM-14217: Fixes for CSS of PCPAccount pages (also affects profiles) where the password/confirm fields are shown.
Merge pull request #2522 from mlutfy/4.4-crm14217

CRM-14217: Fixes for CSS of PCPAccount pages (also affects profiles) where the password/confirm fields are shown.
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-18-07-54-54

Conflicts:
	CRM/Utils/Hook/Joomla.php
	api/v3/examples/LocBlock/Create.php
	api/v3/examples/LocBlock/CreateEntities.php
	api/v3/examples/LocBlock/Get.php
	api/v3/examples/LocBlock/createEntities.php
	api/v3/examples/LocBlock/getEntities.php
	api/v3/examples/LocBlock/simpleCreate.php
	api/v3/examples/LocBlockCreate.php
	api/v3/examples/LocBlockCreateEntities.php
	api/v3/examples/LocBlockGet.php