Merge pull request #16 from niamu/tile_collisions

Rebase with master and burning building fix
new_collisions: fix tests and revert town to regular
Fix some broken tests