fixed some tests
solved some merge conflicts
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
fixed tests for step2
merged with development