Merge branch 'master' of https://github.com/alexgus/jVivarium.git

Conflicts:
	src/fr/utbm/lo43/jvivarium/core/Map.java