Added OpenBay Pro module, no merging done yet.
Merged initial startup/registry changes.
Added PayPal Express Checkout, PayPal PayFlow Iframe, PayPal Payments Pro Iframe, Amazon Payments.
All changes for openbay vqmod file merged.
Merge pull request #790 from welfordmedia/v1.5.5.1

Payment modules
Merged Amazon EU.
Merged Amazon US.
Changed update server.
Merge branch 'v1.5.5.1' of https://github.com/opencart/opencart into v1.5.5.1

Conflicts:
	upload/admin/controller/catalog/product.php
	upload/admin/controller/common/header.php
	upload/admin/controller/sale/order.php
	upload/admin/language/english/common/header.php
	upload/admin/model/sale/order.php
	upload/admin/view/template/catalog/product_form.tpl
	upload/admin/view/template/common/header.tpl
	upload/admin/view/template/sale/order_info.tpl
	upload/catalog/model/checkout/order.php
Testing deploy system non-beta
Merge branch 'v1.5.5.1' of https://github.com/openbaypro/opencart into v1.5.5.1
Testing deploy system non-beta
Updated string to be replaced for version.
Fixed user permissions for top admin at install.
Added int for version id.

Changed location of api call for public notifications.
Updated server url for updates.
Testing auto deploy to patch server.
Fixed unmerged files.
testing non-beta
Removed vqmod folder from version check.