Final indexing changes
Merge branch 'master' of https://github.com/dbpedia-spotlight/dbpedia-spotlight

Conflicts:
	core/src/main/scala/org/dbpedia/spotlight/db/FSASpotter.scala