Merge branch 'master', remote-tracking branch 'origin'
templates and i18n for eamils

* templates use velocity
* i18n is based on system locale
Merge remote-tracking branch 'origin/master' into mailTemplates
Fix test broken by MailConfiguration

* add MailConfiguration to ApplicationtestConfiguration
* removes reference to tatami.properties from MailConfiguration as it
  overrides cassandra port used for testing
Merge pull request #316 from PierreRust/mailTemplates

Mail templates