Merge pull request #1 from opencart/master

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

Merge OC current changes
Update seo_url.php

Replace "&" to "&amp;" in the query variable
Fix calc of PROFILESTARTDATE with proper "gm" func
Update category.php

getCategories() should have an optional data parameter instead of a required one
Fixed Multi Store Order on Custmor/Orders page
Update seo_url.php
Update stylesheet.css

fixed error show 2 or 3 column
https://github.com/opencart/opencart/issues/1953
https://github.com/opencart/opencart/pull/1966
Merge pull request #1861 from pcgamez/patch-1

Fix calc of PROFILESTARTDATE with proper "gm" func
Merge pull request #2005 from mmosolution/patch-3

Update stylesheet.css
Merge pull request #1959 from tomkoo/patch-1

Update category.php
Merge pull request #1802 from ghost/patch-6

Update seo_url.php
Merge pull request #1964 from eka7a/master

Fixed Multi Store Order on Custmor/Orders page
Merge pull request #2004 from opencart-russia/master

Update seo_url.php fix for another route
Update opencart.sql
Update seo_url.php
Merge pull request #3 from opencart/master

Update to latest
Fix for url alias keywords invalid when empty