Update resolve.properties, take bnode of opening hours into account, see #450
Add JSON-LD context
Merge pull request #451 from lobid/issue-450-opening-hours

Update resolve.properties, take bnode of opening hours into account
Include total number of hits in search responses (see #297)
Merge pull request #452 from lobid/issue-297-hits

Include total number of hits in search responses
Merge branch 'master' into issue-430-content-negotiation

Conflicts:
	lodmill-ui/app/controllers/Application.java