fix enotice on priceset update
Merge pull request #3644 from eileenmcnaughton/e-notice-ps

fix enotice on priceset update
CRM-14954 - Fix for offline membership message template and move sample newsletter upgrade templates to sample sub-dir.

----------------------------------------
* CRM-14954:
  https://issues.civicrm.org/jira/browse/CRM-14954
Merge pull request #3646 from davecivicrm/crm-14954

CRM-14954 - Fix for offline membership message template and move sample ...
notice fixes, CRM-14952

----------------------------------------
* CRM-14952: Sorting on state in search throws FATAL error: Database Error Code: Unknown column 'civicrm_state_province.name' in 'field list'
  https://issues.civicrm.org/jira/browse/CRM-14952
Merge pull request #3650 from kurund/CRM-14952

notice fixes, CRM-14952