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
Avoid error for short type names
UIMA annotator: fix typo in parameter name
updating opennlp version
Merge pull request #288 from dav009/fix-opennlp-bug

#287 Updating OpenNLP version
Merge pull request #282 from jgrivolla/fix-uima-annotator

Fix UIMA annotator
use uimafit for parameter initialization
rebasing on top of master