implementatie TaskType
Merge branch 'master' of https://github.com/Desom/SWOP

Conflicts:
	src/domain/assembly/FactoryScheduler.java
	test/domain/assembly/WorkstationTest.java