Merge origin/master

Conflicts:
	lib/AdminTables.php
	lib/Config.php
	lib/UserContent.php