Merge origin/master

Conflicts:
	src/mapbuilder/MapBuilder.java
	src/mapbuilder/MazeGenerator.java
	src/mapbuilder/SteeringDungeonGenerator.java