Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-07-14-23-03

Conflicts:
	CRM/Contribute/BAO/Contribution.php
	CRM/Core/Payment/BaseIPN.php
	CRM/Extension/Manager/Payment.php
	CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl
	README.txt
	sql/civicrm_generated.mysql
	templates/CRM/common/success.tpl
	tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php

diff --cc CRM/Core/BAO/Navigation.php
Simple merge

diff --cc CRM/Core/CommunityMessages.php
Simple merge

diff --cc CRM/Queue/Runner.php
Simple merge

diff --cc CRM/Report/BAO/ReportInstance.php
Simple merge

diff --cc CRM/Upgrade/Page/Upgrade.php
Simple merge

diff --cc CRM/Utils/System.php
Simple merge

diff --cc README.txt
index cb5d9f41439f33d54dff07536aaf61bd6c199025,8a256ed4c5522439bcf1e4026e978872a82cee2e..90e865c8795f2c5bb1ed6ddcd61ea4e7a8a27910
--- 1/README.txt
--- 2/README.txt
+++ b/README.txt
@@@ -24,21 -24,20 +24,23 @@@ and WordPress content management system
  *************************
  2. Installation
  *************************
- Links to download the full CiviCRM package are on our website:
- http://civicrm.org/go/download
+ The download URLs and installation instructions are available on our
+ website:
+ 
+ https://civicrm.org/download
  
 +Installation instruction can be found on the wiki:
 +http://wiki.civicrm.org/
 +
  
  *************************
  3. Documentation
  *************************
  Documentation, as well as the project bug tracker and mailing lists,
- can be found at http://civicrm.org/ Just click on the appropriate link.
+ can be found at https://civicrm.org/ Just click on the appropriate link.
  
 -Our main documentation site is the wiki at http://wiki.civicrm.org/
 -- particularly http://docs.civicrm.org/
 +Our main documentation site is the CiviCRM wiki:
 +http://wiki.civicrm.org/
  
  
  *************************

diff --cc ang/crmUi.js
Simple merge

diff --cc js/Common.js
Simple merge

diff --cc settings/Core.setting.php
Simple merge

diff --cc sql/GenerateData.php
Simple merge

diff --cc sql/GenerateReportData.php
Simple merge

diff --cc templates/CRM/Admin/Page/APIExplorer.js
Simple merge

diff --cc templates/CRM/Admin/Page/PaymentProcessor.hlp
Simple merge

diff --cc templates/CRM/Report/Page/Options.tpl
Simple merge

diff --cc templates/CRM/common/success.tpl
Simple merge

diff --cc xml/templates/civicrm_navigation.tpl
Simple merge

diff --cc xml/templates/civicrm_sample.tpl
Simple merge