updated the ajax file uploads with a custom built jquery
removed some code that is not being used anoy more

removed filter_category_id
Merge pull request #392 from uksitebuilder/Remove-Countries

Remove 2 Countries that are now zones - Fix UK VAT Zones
Merge pull request #389 from uksitebuilder/SEO_URLS-404-Fix

upload/catalog/controler/common/seo_url.php
Royal mail standard Parcels fix
Merge pull request #393 from uksitebuilder/Royal-Mail-Standard-Parcels

Royal mail standard parcels
fix for Bad SQL (date_modified) in admin/model/sale/order
error_custom_field_value
Merge pull request #396 from e-piksel/master

fixed error_custom_field_value
Character Limit (Catalog)
In the list view, short description character limit (categories, special etc)
fix for reports going very slow
catalog_desc_limit renamed -> list_description_limit
Merge pull request #399 from e-piksel/master

catalog_desc_limit renamed -> list_description_limit
reports updated
Merge branch 'master' of https://github.com/opencart/opencart
update to redesign layout route system

Problem with the ModelDesignLayout->getLayout($route)
renamed product option field from option value to just value.

extension and template developers need to make changes accordingly.
Fixed error_desc_limit -> error_limit
Merge pull request #403 from e-piksel/master

Fixed error_desc_limit -> error_limit
more custom field work done