Merge branch 'Joe' into Mike

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