Smarty - Export $crmPermissions object for use in all templates

Conflicts:
	sql/civicrm_generated.mysql
	xml/version.xml

Conflicts:
	sql/civicrm_generated.mysql
	xml/version.xml

CRM-13731 - ManageEvents - after editing event template (w/no start date) error is generated

http://issues.civicrm.org/jira/browse/CRM-13731

CRM-13714 - Display fatal error for Joomla 3.x

CRM-13715 - fix bug when included in report columns

----------------------------------------
* CRM-13715: Add custom field column to Contribution Details report crashes
  http://issues.civicrm.org/jira/browse/CRM-13715

http://issues.civicrm.org/jira/browse/CRM-13714

CRM-13354: fix bad patch for locale detection in Drupal based on domain/suffix

CRM-13711 fix - Price-set validation break in noAmount and noLabel case for non Text type price field

-- CRM-13624 Added notation for parameters of paperIconAttachment function

added unit for units, CRM-13327

----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
  http://issues.civicrm.org/jira/browse/CRM-13327

CRM-13711 fix - Price-set validation break in noAmount and noLabel case for non Text type price field

http://issues.civicrm.org/jira/browse/CRM-13711

CRM-13617 - link custom data for country to state/province drop downs

Handling of CiviCase CustomGroups

CRM-13722 Fixes description of country_id in contact API.

Crm 13718

--  CRM-13617 - Webtest for link of custom data for country to state/province drop downs

----------------------------------------
* CRM-13617: Link Country and state province widget for custom data
  http://issues.civicrm.org/jira/browse/CRM-13617

http://issues.civicrm.org/jira/browse/CRM-13722

----------------------------------------
* CRM-13722: Contact API shows wrong title of field country_id
  http://issues.civicrm.org/jira/browse/CRM-13722

CRM-13712 fix - DB Error on creating Smart Group with Is Empty and/or Not Empty operators via search builder

CRM-13712 fix - DB Error on creating Smart Group with Is Empty and/or Not Empty operators via search builder

http://issues.civicrm.org/jira/browse/CRM-13712

CRM-11881 fix - State/Province required-ness fix if Country doesn't contain it on CiviProfile

CRM-13709 fix - World Region filter doesn't work on Advance Search

----------------------------------------
* CRM-13624: All Tabs - Paperclip Icon
  http://issues.civicrm.org/jira/browse/CRM-13624

CRM-13716 - MailingJob still uses civicrm_activity_target (for multiple bulk emails)

http://issues.civicrm.org/jira/browse/CRM-13716

CRM-13698 - Rebuild generated with corrected option_value.name for No-sh...

----------------------------------------
* CRM-13698: Notice error due to missing ActivityStatus of 7
  http://issues.civicrm.org/jira/browse/CRM-13698

CRM-13716 - MailingJob still uses civicrm_activity_target (for multiple bulk emails)

http://issues.civicrm.org/jira/browse/CRM-13716