Merge
Merge branch 'master' of github.com:AlexCapi/m2m

Conflicts:
	src/agent/Agent.java