Finished test for Amazon Payments; Minor fixes for the Amazon Payments module that were discovered in tests.
Added a selenium test PayPal Express Checkout and fixed minor issues discovered in testing.
Merge pull request #1526 from Martynas-P/master

Selenium test for Amazon Payments
more api work done
Merge branch 'master' of https://github.com/opencart/opencart
Started working on Selenium tests for SagePay Direct.
Added solution ID to authorizenet_sim.tpl
Merge branch 'master' of https://github.com/opencart/opencart
Fixed captcha (forgets them if entered successfully)
Merge branch 'master' of https://github.com/opencart/opencart
Merge pull request #1532 from Martynas-P/master

Fixed Captchas
Allows to enter shipping details for Amazon orders in the bulk update tool.
Merge pull request #8 from Martynas-P/2.0

Allows to enter shipping details for Amazon orders in the bulk update tool.
Merge branch '2.0' of https://github.com/openbaypro/OpenBay-Pro into 2.0
Added xhr.status check before alerting ajax error.
Merge branch '2.0' of github.com:openbaypro/OpenBay-Pro into openbay-opencart-2.0

Conflicts:
	upload/admin/controller/common/menu.php
	upload/admin/index.php
	upload/admin/language/english/common/menu.php
	upload/admin/model/sale/order.php
	upload/catalog/model/checkout/order.php
Merge pull request #11 from Martynas-P/openbay-opencart-2.0

Pulled latest changes from Opencart/opencart master
Changed the requirements functions to a single method which returns array of messages based on errors.
more api work done
more api work done