overwrite wp_email
Merge branch 'master' of github.com:laur-craciun/wordpress

Conflicts:
	lib/SendGridSettings.php