Changed email to e-mail

So far i see the convention for it is e-mail.
Changed email to e-mail
Changed email to e-mail
Merge pull request #1598 from Urs-Bruelhart/patch-3

Changed email to e-mail
Merge pull request #1596 from Urs-Bruelhart/patch-1

Changed email to e-mail
Merge pull request #1597 from Urs-Bruelhart/patch-2

Changed email to e-mail
more api work done
Merge branch 'master' of https://github.com/opencart/opencart
Merge branch 'master' of git@github.com:opencart/opencart.git