Merge origin/master

Conflicts:
	src/java/info/toegepaste/www/controllers/ZoekController.java