Merge origin/master

Conflicts:
	src/java/be/thomasmore/model/Klas.java
	src/java/be/thomasmore/model/Score.java
	src/java/be/thomasmore/model/Student.java
	src/java/be/thomasmore/model/Test.java