Merge branch 'hotfix/0.1.3'
Fix resetting the game for clients
Merge branch 'hotfix/0.1.4' into develop