Conflicts:
	CRM/Utils/System/Base.php
	CRM/Utils/System/Drupal.php
	CRM/Utils/System/Drupal6.php

Also: Update comments

----------------------------------------
* CRM-13014: CiviMobile fatal on non-d7 -Need a UF function for login authenticate
  http://issues.civicrm.org/jira/browse/CRM-13014

Semi-fix {ts} usage: the mix of js/smarty here isn't very practical.

Semi-fix {ts} usage: the mix of js/smarty here isn't very practical. Will be fixed when the js is split out in a separate file eventually.

--worked on CRM-13060
Patched and tested - price_set.financial_type_id is now also set when creating and updating financial type under Manage Events.

CRM-13108 - CRM_Utils_File - Fix warning

----------------------------------------
* CRM-13108: Warnings when extensions is installed
  http://issues.civicrm.org/jira/browse/CRM-13108

Note: According to http://php.net/glob, the return result varies by
platform; sometimes it returns array(), and sometimes it returns FALSE.
The patch should work with either case.

----------------------------------------
* CRM-13108: Warnings when extensions is installed
  http://issues.civicrm.org/jira/browse/CRM-13108

-- worked on CRM-12844

----------------------------------------
* CRM-13060: Changing the Financial Type for Contribution pages and Events does not update the Financial Type selected for Price Sets and Price Field values
  http://issues.civicrm.org/jira/browse/CRM-13060

----------------------------------------
* CRM-12844: Automated recurring contribution "civicrm_line_item" records have wrong financial type id
  http://issues.civicrm.org/jira/browse/CRM-12844

CRM-13103 - Fix hook re-entrancy

----------------------------------------
* CRM-13103: Hook execution terminates prematurely
  http://issues.civicrm.org/jira/browse/CRM-13103

Add unit test in which one hook calls another. Note that this unit-test
doesn't actually reproduce the issue for me (eg it incorrectly shows the
test as passing on code that doesn't work for me in real situations), but
it's still valuable in that it gives us better test coverage.

----------------------------------------
* CRM-13103: Hook execution terminates prematurely
  http://issues.civicrm.org/jira/browse/CRM-13103

CRM-11160 - verifySSL - Display warning next to this config option

CRM-12451

-- fixed for CRM-13065

CRM-13101 fix typo in widget css.

----------------------------------------
* CRM-13101: Typo in contribution widget generated css for .crm-amounts
  http://issues.civicrm.org/jira/browse/CRM-13101

--fixed for CRM-13060

----------------------------------------
* CRM-13065: Upgrade error
  http://issues.civicrm.org/jira/browse/CRM-13065

----------------------------------------
* CRM-13060: Changing the Financial Type for Contribution pages and Events does not update the Financial Type selected for Price Sets and Price Field values
  http://issues.civicrm.org/jira/browse/CRM-13060

CRM-13046

CRM-13082: avoid showing twice custom fields for Case Activity form.

CRM-13063 fix

----------------------------------------
* CRM-13063: Date is incorrect/misformatted in membership receipt email
  http://issues.civicrm.org/jira/browse/CRM-13063

Restore comparison operators for search builder selects

CRM-13040 allow for possiblility geocoder sets postcode

Conflicts:

	CRM/Utils/System/Base.php

CRM-13011 : applied the patch

CRM-13014 - CRM_Utils_System::userLoginFinalize - Disable due to syntax errors

----------------------------------------
* CRM-13014: CiviMobile fatal on non-d7 -Need a UF function for login authenticate
  http://issues.civicrm.org/jira/browse/CRM-13014

CRM-13007 fix