change email newlines
Merge branch 'dev'