Revert "Merge branch 'Adam' into Mike"

This reverts commit 0c3b11dce890976a8e5625dae4a16f4541fd7ea4, reversing
changes made to 726805d34efa5cd4664f0dd11b73382c500c6683.
Revert "Merge remote-tracking branch 'origin/Min' into Mike"

Conflicts:
	src/project/DataManager.java
	src/project/MapPanel.java
fixing