Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-30-12-58-23

Conflicts:
	CRM/Admin/Form/RelationshipType.php
CRM-13927 - Counties: link to local extensions directory in message

----------------------------------------
* CRM-13927: County notice gone missing
  https://issues.civicrm.org/jira/browse/CRM-13927
CRM-13966 - Tagset params fixes
CRM-13966 - Tagset cleanup - remove unused functions
Merge pull request #2998 from yashodha/CRM-14500

CRM-14500: refer to contact id foreign keys dynamically
Allows users to display a contact's profile picture on their name badge
Removed center option and fit width of text for first three rows if user sets show participant image to yes, cleaned up code and variable names
Fix field label in xml
Merge pull request #3062 from colemanw/master

Fix field label in xml
Merge pull request #3023 from KarinG/CRM-11302

CRM-11302: mailing optout/unsubscribe verification
CRM-14581 upgrade Multisite form
comment fixes only
CRM-14581 user selector on group field - fix post process
Merge pull request #3051 from KarinG/CRM-14515

CRM-14515 - Replace 360px PCP image restriction w/ CSS resizing.
CRM-13966 - Cleanup tagset function signature

----------------------------------------
* CRM-13966: Migrate asmSelect, tokeninput and autocompletes to use Select2
  https://issues.civicrm.org/jira/browse/CRM-13966
revert change on case - intended for separate commit set
CRM-14361 - Prevent addition of option values to certain option groups including contribution_status, financial_item_status, batch_status and others which are used programmatically.

----------------------------------------
* CRM-14361:
  https://issues.civicrm.org/jira/browse/CRM-14361
Merge pull request #3064 from davecivicrm/CRM-14361

CRM-14361 - Prevent addition of option values to certain option groups i...
Merge pull request #3003 from generalredneck/CRM-14171

CRM-14171: Give configuration warning if Anonymous role is granted inappropriate permissions
CRM-14466 initialized variables to get rid of php notices