Merge branch 'master' into DanceBuilder
 - Timer in Japan now works correctly
 - modifier Japan displays correctly
Merge branch 'DanceBuilder'
Merge branch 'master' into FroggerBuilder
 - submarine no longer fires missiles
Merge branch 'FroggerBuilder'
 -  a couple of sprite updates