Fixed remaining incorrect indented code. All code should now be tabs.
Whitespace removed.
Standards improved; blank lines and concat spacing
Merge branch 'master' of https://github.com/opencart/opencart