placeholders
Merge branch 'permissions' of https://github.com/databrary/databrary into permissions

Conflicts:
	app/assets/templates/form/volumeEditOverviewForm.html