Merge branch 'develop'
Merge branch 'develop'
fixed portforwardings for mailcatcher
allow mailcatcher to receive connections from the host
Merge branch 'peterrus-patch-fix-mailcatcher' into develop
fixed #29
Remove mailcatcher port forwarding