Fixed
Merge branch 'master' of https://github.com/baka-rust/sunstone

Conflicts:
	client/src/Dungeon.cpp
	server/src/Dungeon.cpp
Merge branch 'master' of https://github.com/baka-rust/sunstone