Merge pull request #1525 from Martynas-P/master

Selenium tests for Amazon Payments
Removed duplicate placeholder text in search module.
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