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
Updated Amazon settings' pages language strings
Removed / moved openbay admin events

Removed unused language files for amazon/amazonus
Merge branch 'master' of https://github.com/openbaypro/OpenBay-Pro
Fixed event names

Added back lang files.
Fixed event add/delete for openbay markets.
Language string fix.
Updated templates for newer layout.
More language and tpl updates.
tpl layout fix
added less-1.7.4.min.js also fixed an issue with  he events system
Merge branch 'master' of https://github.com/opencart/opencart
https://github.com/opencart/opencart/issues/1324
https://github.com/opencart/opencart/issues/1810
https://github.com/opencart/opencart/issues/1817
updating the admin, adding stats to the dashboard
Merge branch 'master' of https://github.com/opencart/opencart