Added a server side check for invalid from emails for email templates (we don't want them using whatever we actually use otherwise we may get black listed with them.
Merge branch 'master' of github.com:ucdavis/ACE