Revert "fix conflict"

This reverts commit ed4e4782da82182a32206c981bee55b3d5d1ed18.

Conflicts:
	conf/messages
Merge branch 'excerpts' of github:databrary/databrary into excerpts