Conflicts:
	sql/civicrm_generated.mysql
	templates/CRM/Activity/Form/Task/AddToTag.tpl
	xml/version.xml

CRM-13889 - api_v3_DashboardContact - Fix validation

CRM-14092 - restrictBrowsing - Defensive programming

CRM-13958, fixed indentation for DAO's

----------------------------------------
* CRM-13958: DAO's generated are not indented correctly
  http://issues.civicrm.org/jira/browse/CRM-13958

CRM-10466 - Ensure token hooks are always called

It's OK if restrictBrowsing fails -- because we'll still perform a
behavioral test and alert admin if browsing is enabled.

This reverts commit 94e9b0c5.

Remove unnecessary tpl

allow other grouping to have subsections in report listings

CRM-14091, CRM-14092 - More caution

CRM-14179 fix word replacement existing rows count

CRM-14092 - CRM_Utils_Check_Security::isBrowseable - Fix warning

We don't care if there's an HTTP 404 when checking for browsability --
because 404 is another of saying "not browseable!"

cow:options

Conflicts:
	tests/phpunit/api/v3/GroupContactTest.php

fixes CRM-14175, ignore bulk activities while fetching contact names for...

----------------------------------------
* CRM-14175: activity tab on contact summary is super slow
  http://issues.civicrm.org/jira/browse/CRM-14175

CRM-14137 - further PR on returning report_template metadata in getrows api action

Form style improvements