merge
Merge branch 'master' of https://github.com/MKBid/Baanmakelaar.nl.git

Conflicts:
	controllers/contents_controller.php
merge
Merge branch 'master' of https://github.com/MKBid/Baanmakelaar.nl.git

Conflicts:
	controllers/contents_controller.php