Lagt til SCM_S1 og SCM_Suppler
Merge branch 'oblig1' of https://github.com/morganbp/AgentSystems into oblig1
Merge branch 'oblig1' of https://github.com/morganbp/AgentSystems into oblig1
TEST
Merge branch 'oblig1' of https://github.com/morganbp/AgentSystems into
oblig1

Conflicts:
	Project/src/no/agentsystems_dhom/server/TACSSCMImpl.java
Merge branch 'oblig1' of https://github.com/morganbp/AgentSystems into oblig1