Baanmakelaar:
- Search setup
- ConsumerKey to API
Merge branch 'master' of ssh://git@github.com/MKBid/Baanmakelaar.nl.git

Conflicts:
	controllers/contents_controller.php
	views/smarty/templates/contents/contact-page.tpl
	views/smarty/templates/contents/email.tpl
	views/smarty/templates/contents/email/contactemail
	views/smarty/templates/contents/left-tekst-right-image.tpl
	views/smarty/templates/contents/square-list.tpl
	views/smarty/templates/elements/contactform.tpl
	views/smarty/templates/elements/header.tpl
	views/smarty/templates/layout.tpl