Merge branch 'bugfixes'
Merge branch 'master' into bugfixes
player2 hud adjusted