Merge branch 'CRM-15714' of https://github.com/adixon/civicrm-core into adixon-CRM...

Conflicts:
	CRM/Core/Payment.php

----------------------------------------
* CRM-15714: validateCreditCard function makes too many assumptions
  https://issues.civicrm.org/jira/browse/CRM-15714

diff --cc CRM/Contribute/Form/Contribution/Main.php
Simple merge

diff --cc CRM/Contribute/Form/UpdateBilling.php
Simple merge

diff --cc CRM/Core/Payment.php
Simple merge

diff --cc CRM/Core/Payment/Form.php
Simple merge

diff --cc CRM/Event/Form/Participant.php
Simple merge

diff --cc CRM/Event/Form/Registration/AdditionalParticipant.php
Simple merge

diff --cc CRM/Event/Form/Registration/Register.php
Simple merge

diff --cc CRM/Member/Form/Membership.php
Simple merge