Merge origin/master

Conflicts:
	web/resultatenTest.xhtml
Merge origin/master