commit error
Merge branch 'master' of https://github.com/Desom/SWOP

Conflicts:
	src/domain/assembly/assemblyline/AssemblyLine.java
	src/domain/assembly/assemblyline/status/AssemblyLineStatus.java
	src/domain/assembly/assemblyline/status/StatusCreator.java