More closing tags added to files.
Merge branch 'v1.5.6.1' of https://github.com/opencart/opencart into v1.5.6.1