Update
Merge branch 'master' of https://github.com/Donneh/leintje

Conflicts:
	class/Database.class.php