Merge branch 'master' into eigenheim
Changed mailer to play 2.3
resolved conflict