Merge commit '72f505'

Conflicts:
	src/Map.java
Merge commit '35687af'

Conflicts:
	src/Map.java