TexManager now uses Tilemap too
Merge branch 'tilemap'