Tiles now resolve by name instead of id
Merge with master