Merge branch 'master' into Mike
some data parsing for datamanager
Merge branch 'Joe' into Mike
Merge branch 'Joe' into Mike
Merge branch 'Joe' into Mike

Conflicts:
	src/project/CountryData.java
updated branch
Merge branch 'Mike' into Joe
newest
Merge branch 'Mike' into Joe