Merge branch 'master' into staging
Merge branch 'staging' of github.com:alabs/oigame into staging