Applied only some minor changes and fixed some compiler errors.
Merge branch 'development' of https://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into development

Conflicts:
	src/mas/serviceAgent/src/serviceAgent/Service.java
	src/mas/serviceAgent/src/serviceAgent/behaviour/GetProductStepDuration.java
	src/mas/serviceAgent/src/serviceAgent/behaviour/GetServiceDuration.java