Merge branch 'master' into issue-523-index-not_analyzed

Conflicts:
	lodmill-ld/src/main/resources/index-config.json