refactoring
Merge remote-tracking branch 'origin/dev_game_HUD' into dev_game_HUD