mass_upload fixes
merged fixes
fixes test suite
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop