Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-09-14-08-33

diff --cc CRM/Admin/Page/Admin.php
index 05cd744f700d75c6773c15bae48f5eedcce6981a,3b29c3f559275b243494929424bae6fcf13d37ff..a0a261b3c9bf2884534bffe19d169434fcb7da8b
--- 1/CRM/Admin/Page/Admin.php
--- 2/CRM/Admin/Page/Admin.php
+++ b/CRM/Admin/Page/Admin.php
@@@ -41,8 -41,24 +41,10 @@@ class CRM_Admin_Page_Admin extends CRM_
     * @return string
     */
    public function run() {
 -    $errorMessage = '';
 -    // ensure that all CiviCRM tables are InnoDB, else abort
 -    // this is not a very fast operation, so we do it randomly 10% of the times
 -    // but we do it for most / all tables
 -    // http://bugs.mysql.com/bug.php?id=43664
 -    if (rand(1, 10) == 3 &&
 -      CRM_Core_DAO::isDBMyISAM(150)
 -    ) {
 -      $errorMessage = ts('Your database is configured to use the MyISAM database engine. CiviCRM requires InnoDB. You will need to convert any MyISAM tables in your database to InnoDB. Using MyISAM tables will result in data integrity issues.');
 -      CRM_Core_Session::setStatus($errorMessage, ts('Warning'), "alert");
 -    }
 -
 -    if (!CRM_Utils_System::isDBVersionValid($errorMessage)) {
 -      CRM_Core_Session::setStatus($errorMessage, ts('Warning'), "alert", array('expires' => 0));
 -    }
 +    Civi::resources()->addStyleFile('civicrm', 'css/admin.css');
  
+     $this->assign('registerSite', htmlspecialchars('https://civicrm.org/register-your-site?src=iam&sid=' . CRM_Utils_System::getSiteID()));
+ 
      $groups = array(
        'Customize Data and Screens' => ts('Customize Data and Screens'),
        'Communications' => ts('Communications'),

diff --cc CRM/Admin/Page/ConfigTaskList.php
Simple merge

diff --cc CRM/Report/Form/Instance.php
Simple merge

diff --cc templates/CRM/Admin/Page/Admin.tpl
Simple merge

diff --cc templates/CRM/Admin/Page/ConfigTaskList.tpl
Simple merge

diff --cc templates/CRM/Report/Form/Layout/Table.tpl
Simple merge