t
Merge branch 'master' of https://github.com/R1-Group-POP/srs

Conflicts:
	SRS_School/build/built-jar.properties
	SRS_School/build/classes/dk/pop/srs/sag/SagsKatalog.class
	SRS_School/build/classes/dk/pop/usecases/srs/redsag/REDGUI.class