Named entity recognition module
Conflicts:
	src/main/webapp/WEB-INF/zul/query/search/entityExtraction.zul