bugfix with <br/> instead of <br> in html-mails
Merge branch 'master' into jupis