update to the admin also simplified the mail system
Merge branch 'master' of https://github.com/opencart/opencart