fix conflict
Merge branch 'excerpts' of github.com:databrary/databrary into excerpts

Conflicts:
	conf/messages