WIP do not merge
Merge pull request #13 from Rud5G/add-mailcatcher-to-development

Add mailcatcher