Fixed a bug.
Merge origin/master

Conflicts:
	src/engine/monica/core/map/Map.java