Merge pull request #1 from opencart/master

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

Merge OC current changes
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
BUG FIX on affiliate_list.tpl

BUG Found on On admin > Marketing > Affiliates
On the list you can't delete an affiliate due a missing action on the form
This fix de bug.
Merge pull request #2013 from JAY6390/master

Fix for URL alias empty string
Merge pull request #2014 from CoverUp/patch-1

BUG FIX on affiliate_list.tpl
Merge pull request #2009 from opencart-russia/master

add url_alias and redirect 301