InfoBox Updates
DataFile change
Merge remote-tracking branch 'origin/Min' into Mike

Conflicts:
	src/CountryData.txt
	src/project/DataManager.java
	src/project/MapPanel.java
commitig