Merged from master and jeff branches
Clear dungeon when saving and closing current game