Commiting to solve merging error
Merge branch 'master' of
https://github.com/VI51WorldWar/VI51_WorldWar.git

Conflicts:
	src/fr/utbm/vi51/agent/Worker.java
	src/fr/utbm/vi51/gui/Main.java
Addition of a new agentscheduler which calls the environment at the very
end.
Added some small fixs to be 1.6 compatible.