Standards improved (white space, indents)
Merge branch 'master' of https://github.com/opencart/opencart