Finished merge. Creating pull request. non-beta
Merge branch 'v1.5.5.2' of https://github.com/openbaypro/opencart into v1.5.5.2
Removed test file.non-beta