bugfix
Merge branch 'master' of https://github.com/physje/funda

Conflicts:
	include/functions.php