Merge origin/master

Conflicts:
	src/model/agent/Agent.java
Merge origin/master

Conflicts:
	src/model/agent/Detector.java