Fixed bugs which made dungeon unplayable
Merge remote-tracking branch 'origin/master'