CRM-12594

----------------------------------------
* CRM-12594: Wrong texts in UI
  http://issues.civicrm.org/jira/browse/CRM-12594
CRM-12594

----------------------------------------
* CRM-12594: Wrong texts in UI
  http://issues.civicrm.org/jira/browse/CRM-12594
Merge pull request #856 from dlobo/CRM-12594

CRM-12594 - Fix typo in warning message
Automatically filter test records on forced searches CRM-12610
CRM-12688
CRM-10692 - commit andrew hunt patch. rework in next commit

----------------------------------------
* CRM-10692: unable to override /CRM/Core/Utils.php from extension
  http://issues.civicrm.org/jira/browse/CRM-10692
Merge pull request #862 from dlobo/CRM-10682

CRM-10692 - commit andrew hunt patch. rework in next commit
CRM-12688
CRM-11320 this makes the api stable from 4.2 to 4.3

Conflicts:

	api/v3/Contribution.php
CRM-11320 fix error in test
CRM-12160 Fix domain on navigation inserts

Conflicts:

	CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
	CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
CRM-12160 menu fixes for 4.3
Merge pull request #863 from eileenmcnaughton/CRM-11320

Crm 11320 - make api stable for 4.3
Merge pull request #860 from yashodha/CRM-12688

CRM-12688
Merge pull request #857 from colemanw/is_test

Automatically filter test records on forced searches CRM-12610
Merge pull request #864 from eileenmcnaughton/CRM-12160

Crm 12160 -fix navigation upgrade errors
applied patch for CRM-12673
Merge pull request #866 from kurund/CRM-12673

applied patch for CRM-12673
-- removed cruft data for grant, worked on CRM-12665

----------------------------------------
* CRM-12665: Remove unwanted files in Grant
  http://issues.civicrm.org/jira/browse/CRM-12665
Merge pull request #867 from pradpnayak/CRM-12665

-- removed cruft data for grant, worked on CRM-12665