Less talk about rights
Merge branch 'master' into devel

Conflicts:
	html/index.php