switch to linear regression mixture for merged disambiguator
Merge branch 'v0.6' of https://github.com/bernhardschaefer/dbpedia-spotlight into v0.6

Conflicts:
	core/src/main/scala/org/dbpedia/spotlight/graphdb/DBMergedDisambiguator.scala