Merge origin/master

Conflicts:
	SysteemAdmin/AdminLogin.php
Merge origin/master