HOTFIX - small spelling and text changes
Merge branch 'master' into develop
Increase test coverage
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into feature-mass-upload