Merge branch 'master' into Paul

.classpath

.settings/org.eclipse.jdt.core.prefs

src/events/VillageEvent.java

src/main/Case.java

src/main/Region.java

src/main/Scan.java

src/main/Type.java

src/units/Paysant.java

src/units/Unite.java