some email tweaks
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
some email details, vat...
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop