Map Fixes

Map and Tileset fixes
Merge branch 'master' of https://github.com/WhiteVoidia/globalgamejam-mirrors