----------------------------------------
* CRM-11137:
  http://issues.civicrm.org/jira/browse/CRM-11137

CRM-11790

CRM-13015 changing label for Additional Address 1 & 2 to Supplemental Ad...

Conflicts:
	CRM/Upgrade/Incremental/sql/4.4.alpha1.mysql.tpl
	sql/civicrm_generated.mysql

CRM-11790

CRM-12539 fix

CRM-13034 Fix formRule in Main.php to ensure that premium minimum req am...

CRM-10935

CRM-13015 changing label for Additional Address 1 & 2 to Supplemental Address. Changed address_options setting for new installs and upgrade to use updated label. Also corrected the upgrade of SMS option_value to use the localize method instead of looping on locales.

----------------------------------------
* CRM-13015: Additional Address label is confusing, consider changing it back to Supplemental Address
  http://issues.civicrm.org/jira/browse/CRM-13015

----------------------------------------
* CRM-12539: "Greater London" should be "London" in list of UK states and provinces
  http://issues.civicrm.org/jira/browse/CRM-12539

CRM-13079 Add logic to MembershipBlock formRule to verify that the numbe...

CRM-10976

CRM-12943 - Backbone.sync persistence using CRM.api

----------------------------------------
* CRM-12943
  http://issues.civicrm.org/jira/browse/CRM-12943

----------------------------------------
* CRM-12943: Make HTML prototype of job UI functional
  http://issues.civicrm.org/jira/browse/CRM-12943

----------------------------------------
* CRM-12943: Make HTML prototype of job UI functional
  http://issues.civicrm.org/jira/browse/CRM-12943

CRM-13034 Fix formRule in Main.php to ensure that premium minimum req amount is checked regardless of whether contribution page contains a quick config amount_block OR has membership block or a price set.

----------------------------------------
* CRM-13034: Premium minimum price isn't checked if Amounts Block is deselected
  http://issues.civicrm.org/jira/browse/CRM-13034

CRM-13079 Add logic to MembershipBlock formRule to verify that the number of enabled membership types is not greater than max allowed in the underlying CRM_Price_Field NUM_OPTION constant. Prevents silent failure. Also bump up the constant to 15 from 11.

----------------------------------------
* CRM-13079: hard limit on number of options for price field; no warning/error
  http://issues.civicrm.org/jira/browse/CRM-13079

reverting changes done in 26dcc9eb relat...

reverting changes done in 26dcc9eb related to CRM-9386, this was creating duplicate memberships

CRM-12912, exposing hook injected fields in profiles

----------------------------------------
* CRM-12912:
  http://issues.civicrm.org/jira/browse/CRM-12912

CRM-9744, CRM-12531

Fixed/Modified the earlier patch for CRM-12695 wrt comment on PR - 1135

CRM-11316 Fix online contrib, event reg, PCP account, petition signature...

Crm 12735

CRM-13074 - Failure on CMS user deletes contribution