fix Issue #305
Merge pull request #314 from hellsingblack/master

fix Issue #305
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