Merge origin/master

Conflicts:
	src/mapbuilder/MapBuilder.java
	src/mapbuilder/Room.java
	src/mapbuilder/SteeringDungeonGenerator.java
	src/mapbuilder/Vector2.java