BehaviourComposite
Merge branch 'master' of git@github.com:trecouvr/ia04.git

Conflicts:
	ia4_project/src/fr/utc/ia04/agent/Human.java
	ia4_project/src/fr/utc/ia04/simulation/SimulationConstants.java