#1121 changed texts
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop