Fix problems with commit 4c42128
Fix typo error from fc9ac52
VIVO-82 Fix the creation of short-term models.

In the previous version of ModelAccess, all of the language-aware models were wrapped around their counterparts from the Context, so they did not come from the ShortTermRDFService. Fix it so any model that is not memory-mapped is built from the ShortTermRDFService.
VIVO-281 Make extended linked data a configurable option.
VIVO-292 remove extra spaces
VIVO-293 Create language strings for search error messages.
Make abox and tbox aware of "everytime" RDF files.
VIVO-293 Create language strings for search error messages.
updates to include method that checks whether uri exists or not
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
Adding content negotiation to sparql servlet VIVO-282
minor changes to content negotiation for sparql servlet VIVO-282
Merge branch 'issue-VIVO-282-content-neogitation' into develop
Merge remote-tracking branch 'origin/develop' into dev-isf

Conflicts:
	webapp/rdf/displayDisplay/everytime/displayDisplay.n3
	webapp/web/i18n/all.properties
	webapp/web/templates/freemarker/lib/lib-properties.ftl