Test
Merge origin/master

Conflicts:
	View/ListDocumentsAdminView.php