fix broken script element
messages - minor email adjustment
Merge branch 'master' into integration