Merge origin/master

Conflicts:
	src/test/java/org/mesol/spmes/EquipmentTest.java