Jar update
Merge commit '507cfcf23b7150e36f396068b4a847ca01b59e6d' into resyncGame