Merge branch 'hotfix-windows-mime' into develop
update README to reflect current branching scheme
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'release-lizzie' into develop
Merge branch 'release-lizzie' into develop
started to write feature tests for emails
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
fix #612

change DREAM TEAM to Dream-Team | use backslash for escaping the character "-"
Merge pull request #639 from dennym/patch-4

fix #612
added some feature tests for transaction mailer helper and added anonymization for user ips
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'develop' into release-lizzie