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

Conflicts:
	class/DbRegister.class.php
	html/register.php
Merge branch 'master' of https://github.com/Donneh/leintje

Conflicts:
	html/register.php