removed the auto load as it makes the code look unintelligible.
Merge branch 'master' of https://github.com/opencart/opencart