My stuff
Merge branch 'master' into REL_0.1-beta

Conflicts:
	lib/dhds.php
	lib/settings.php