Switch to a 4x4 grid of 12x12 tiles
Merge branch 'master' into nhandler-working-resize