Fix various typos, js MIME type, thanks to @fbonzon, fixes #296
Merge remote-tracking branch 'upstream/master'

Conflicts:
	class.phpmailer.php
greetdelays