Merge branch 'release/2.5.3' into develop
2014 pricing, international rates updated too
Added Helper test
Moved world zone codes into protected class vars, and replaced switch with if/else
Helper improvements, comments and more descriptive method names
Bug fix: additional weight charges helper didn't calculate correctly
Amended comment
Merge pull request #9 from ashsmith/feature/march2014pricing

2014 pricing, international rates updated too
Bump the version number
Merge branch 'release/2.6.0'
Merge tag '2.6.0' into seedsman

2.6.0

Conflicts:
	app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail.php
	app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Airmail.php
	app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Airsure.php
	app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltrackedsigned.php
changed: restore Airsure (now international tracked) restrictions for Australia, Brazil, Canada or Israel
changed: restore allowing "international standard (formerly airmail) for Australia, Brazil, Canada, and Israel (in frontend only)