werkend online
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/facebook/base_facebook.php
	data/facebook/facebook.php
	data/leiding.php
	leiding.php