More icon fixes - should all be multiples of 16
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
Merge pull request #2530 from monishdeb/CRM-14195

CRM-14195 fix - Fix buildACLClause for Activity Reports
CRM-13929 Refactor contribution forms
CRM-13929 Cleanup activity form
HR-231 : support for Report menu items based on grouping
Merge pull request #2533 from yashodha/4.4

HR-231 : support for Report menu items based on grouping
Merge pull request #2523 from mlutfy/4.5-crm14319

CRM-14219: templates/CRM/PCP/Form/Campaign.tpl: convert markup from tables to divs.
Merge pull request #2532 from colemanw/ac2

Work on refactoring autocompletes
Batch entry label change
CRM-14243: 'ts' fix for file upload description.
CRM-13986 - CRM_Core_Invoke - Handle HTML and WS requests differently

For HTML, use the CMS's output mechanism (with its theming, etc)
For web services (or any non-HTML content), use Symfony's output mechanism
Merge pull request #2535 from totten/master-symfony-ws

CRM-13986 - CRM_Core_Invoke - Handle HTML and WS requests differently
Merge pull request #2534 from mlutfy/4.4-crm14243-tsfix

CRM-14243: 'ts' fix for file upload description.
HR-216 - crm.backbone.js - Allow limiting the return to specific fields
Merge pull request #2536 from totten/4.4-backbone-return

HR-216 - crm.backbone.js - Allow limiting the return to specific fields
CRM-14253 - CRM_Utils_REST - Read $_GET/$_POST but not $_COOKIE
HR-216 - Setting.API - Ignore "options"
HR-216 - civicrm.css - Use same styling for "crm-button" in ".crm-container" and "#crm-container"
Drupal 8 preparation - move userFramework ID retrieval to UF classes