EntityReferenceResolver replaced with webUtils
Merge branch 'lucene-search' into dev