Merge pull request #1 from opencart/master

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

Merge OC current changes
Merge pull request #3 from opencart/master

Update to latest
Fix for url alias keywords invalid when empty
Merge pull request #2013 from JAY6390/master

Fix for URL alias empty string