digger de fou !
Merge origin/master

Conflicts:
	src/model/environment/Environment.java
Merge origin/master