Standards improved; whitespace, indents
Standards updated: string concat
Merge branch 'master' of https://github.com/opencart/opencart