mer
Merge branch 'master' of https://github.com/blaavogn/GameMaster
Freeze fix
Merge branch 'master' of https://github.com/blaavogn/GameMaster