Merge branch 'hotfix/mailerfix' into develop
Merge branch 'hotfix/stmpfix' into develop
Add I18n
Merge branch 'release/v0.0.18'