t
Merge branch 'master' of https://github.com/anserud/ou3.git

Conflicts:
	ou3_rumor/src/AgentMessage.java
Test