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

Conflicts:
	settings/authorization.php