df
Merge branch 'RC' of https://github.com/morganbp/AgentSystems into RC

Conflicts:
	Project/src/no/agentsystems_dhom/agent/SCM_Agent.java