--fixed for CRM-12233
Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-12233
-- sample data fixes for CRM-12233
CRM-12117
Merge pull request #280 from dlobo/CRM-12117

CRM-12117
Merge pull request #279 from pradpnayak/CRM-12233

--fixed for CRM-12233
CRM-12233 Add upgrade statement to fix Membership field label for quick config

----------------------------------------
* CRM-12233: Online membership signup - contribution amounts field should not be required + various notices
  http://issues.civicrm.org/jira/browse/CRM-12233
Merge pull request #281 from davecivicrm/CRM-12233

CRM-12233 Add upgrade statement to fix Membership field label for quick ...