fixed some email issues
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
fixed some of the last minute issues