UI aanpassingen, invoegen tempates, error aanpassingen
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/resources/message.properties
	WebApp/src/main/webapp/resources/css/main.css