Update tiles, new objects
Merge branch 'master' of https://github.com/nodoxi/phobia

Conflicts: