Gewenste aanpassingen
Merge branch 'develop' of https://github.com/weskor/Flex into develop

Conflicts:
	wp/wp-content/themes/flexwrapp/assets/css/style.css