Merge remote-tracking branch 'upstream/master'
[Accessment] Tardis.jar (Ship fix)
Merge pull request #273 from ping19/master

game.jar fix