Fixed the gui
Merge branch 'oblig2' of https://github.com/morganbp/AgentSystems into
oblig2

Conflicts:
	Project/src/no/agentsystems_dhom/customer/SCM_Customer.java