augustpr0
Merge branch 'master' of
https://github.com/AugustRansnas/MApraktikfall2.git

Conflicts:
	BrokerApplicationEJBProject/ejbModule/brokerapplication/facade/ics/Facade.java
	BrokerApplicationEJBProject/ejbModule/brokerapplication/facade/ics/FacadeLocal.java