Merge branch 'master' into hbz01-to-lobid_neu

Conflicts:
	lodmill-ui/app/models/queries/LobidResources.java
	lodmill-ui/app/views/tags/resource.scala.html