#1024 and #993
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
fixed tests
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
image attachments refactored