Merge branch 'master' into ui_bugfixes
Merge branch 'ui_bugfixes' of github.com:hellochar/the_game_bazaar into ui_bugfixes