fixed tile scale bug
added new tileset
Merge branch 'Harald' into Matias
add/remove layers
Merge branch 'Matias' into Harald