Plotgen items partly integrated in game
Merge branch 'dev' of https://github.com/ravertass/KandidatRoguelike into dev

Conflicts:
	se/chalmers/roguelike/World/Dungeon.java