https://github.com/opencart/opencart/issues/2236
Merge branch 'master' of https://github.com/opencart/opencart
mod update for replacement function
https://github.com/opencart/opencart/issues/2118
commit before i move my web server
removed some test code from the install sql
https://github.com/opencart/opencart/issues/2237
fixed the installer. not sure if its fixed the mac issues but to be honest nobody uses mac for a web server!
remove tooltip before deleting option row
rename no_image.jpg -> no_image.png when selecting new template
Merge pull request #2244 from websitedesignby/patch-3

rename no_image.jpg -> no_image.png when selecting new template
updated the autocomplete code.
https://github.com/opencart/opencart/issues/2113
Merge branch 'master' of https://github.com/opencart/opencart
https://github.com/opencart/opencart/issues/2246
fix for undefined variable
Merge pull request #2241 from websitedesignby/patch-2

remove tooltip before deleting option row
Auto sort order
https://github.com/opencart/opencart/issues/2236
line update