Merge pull request #1 from opencart/master

Update code with OC updates
Merge pull request #2 from opencart/master

Merge OC current changes
Update image.php

Fix Errors
Update seo_url.php

Replace "&" to "&amp;" in the query variable
Update settings forms for OpenBay Pro to new help files.
More OpenBay Pro admin template and language file updates.
Fixed missing language vars
Added missing element in breadcrumb
Removed overview language files and merged into the main lang file for each market.
Updated dashboard tpl layouts.
OpenBay TPL updates to new form layout.

Removed markets tab in OpenCart product edit page.
Moved encryption class used in all OpenBay libraries to openbay library file - code optimise.

Changed code in openbay library files to be more consistent across all libraries.(method names, var names etc).

Moved Amazon and AmazonUs front end controllers from amazon/amazonus folders into the openbay folder. Reduced number of files.
Fixed double base64 encoding.
More OpenBay Pro language and template code tidy and string updates.
Styling updates
FAQ style update
Fixed display none for FAQ
Minor fixes
Fixed missing language strings.

Updated position of FAQ
faq fix