applied annotations
changes leading to compilation
some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/agents/BerserkBehaviour.java
	src/main/java/agents/CannonFodder.java
	src/main/java/agents/ReactiveBehaviour.java
	src/main/java/agents/World.java