Working in the integration.
Merge branch 'patrick' of https://github.com/osrf/robocup_3d_simulation into patrick

Conflicts:
	robocup_agent_plugin/include/robocup_agent_plugin/AgentPlugin.hh