Merge pull request #874 from kurund/CRM-12705

applied patch for CRM-12705
Merge pull request #873 from ravishnair/CRM-12410QAfix

-- CRM-12410 Minor QA fix
Merge pull request #872 from eileenmcnaughton/master

a bit more formatting / whitespace
Merge pull request #871 from colemanw/versionAlert

Add versionAlert setting CRM-12701
Merge pull request #870 from colemanw/import

Rename CRM_Import -> CRM_Contact_Import CRM-11254
Merge pull request #869 from totten/cms-perms

CRM-12499 - Allow CMS-specific permission expressions
Merge pull request #868 from kurund/CRM-12681

worked on CRM-12681, fixed display of copy checkbox when billing block i...
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-28-14-04-12

Conflicts:
	CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
	CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
	sql/civicrm_generated.mysql
CRM-12697
Merge pull request #875 from yashodha/4.4

CRM-12697
-- added upgrade script to add default account relationships for financial type, worked on CRM-12470

----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
  http://issues.civicrm.org/jira/browse/CRM-12470
fix formatting and tabs
Merge pull request #876 from dlobo/MiscFixes

fix formatting and tabs
--fixed for CRM-12649

----------------------------------------
* CRM-12649: Restore the Select Discount Set option for back-office event registration when event has Discounts by Signup Date
  http://issues.civicrm.org/jira/browse/CRM-12649
improve mail log comment
Merge pull request #877 from dlobo/MiscFixes

improve mail log comment
-- CRM fixes for CRM-12470

----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
  http://issues.civicrm.org/jira/browse/CRM-12470
* CRM-12470-masterFixes:
  http://issues.civicrm.org/jira/browse/CRM-12470-masterFixes
Merge pull request #878 from pradpnayak/CRM-12470-masterFixes

-- CRM fixes for CRM-12470
Merge pull request #879 from pradpnayak/CRM-12649

--fixed for CRM-12649
Merge pull request #880 from pradpnayak/CRM-12470

-- added upgrade script to add default account relationships for financi...