fase 2
fase2
Merged 'develop'.

Conflicts solved:
	contact.php
	css/form-planner.css
	index.php
	new_layout.php
	question.html
	waarom-ov.html
Merged 'develop'.
Merge wmo-homepage