Next
Merge remote-tracking branch 'origin/master'

Conflicts:
	PaF-Assignment-2/src/model/datahandler/Purpose.java
	PaF-Assignment-2/src/model/datahandler/Scope.java
	PaF-Assignment-2/src/paf/assignment/pkg2/PaFAssignment2.java