Merge branch 'master' into develop
align acp with ucp, but leave the game pulldown

so you can override guild game if you wish, but this is not recommended.
Merge branch 'develop'