Merge branch 'master' into develop
Merge branch 'master' of github.com:fairnopoly/fairnopoly
hotfix: fixed #933
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'master' into develop