Merge branch 'master' of https://github.com/maddevious/framework.git

Conflicts:
	htdocs/sso.php
	htdocs/verifypasswd.php