Revert "Merge branch 'development' of https://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into development"

This reverts commit e3330bb1c96dec566712c643cfcaf6fc20222ddc, reversing
changes made to 77ecd77791839343b8f72d1625cafd8cde2c01a5.
Merge branch 'development' of https://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into development

Conflicts:
	src/java/rexos/mas/equiplet_agent/EquipletAgent.java
	src/java/rexos/mas/equiplet_agent/behaviours/AbortStep.java
	src/java/rexos/mas/logistics_agent/behaviours/CancelTransportBehaviour.java
	src/java/rexos/mas/service_agent/ServiceAgent.java
Revert "Revert "Merge branch 'development' of https://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into development""

This reverts commit 42cde0e82921a89adc4b8e5b77fdf769a80a5021.

Conflicts:
	src/java/rexos/mas/equiplet_agent/EquipletAgent.java
	src/java/rexos/mas/equiplet_agent/behaviours/AbortStep.java
	src/java/rexos/mas/logistics_agent/behaviours/CancelTransportBehaviour.java
	src/java/rexos/mas/service_agent/ServiceAgent.java