Merge pull request #4773 from civicrm/version-fix

fix version in header

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/Core/Payment/ProcessorForm.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

diff --cc tests/phpunit/WebTest/Contact/SearchBuilderTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Contribute/AddBatchesTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Contribute/OnlineContributionTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Event/AddEventTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Pledge/StandaloneAddTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Profile/BatchUpdateTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Profile/ProfileGroupSubscriptionTest.php
Simple merge