test + debugging
Merge branch 'master' of https://github.com/Desom/SWOP

Conflicts:
	src/domain/assembly/OperationalStatus.java