Merge pull request #1 from bernhardschaefer/master

Add host and port customization possibility for SpotlightAnnotator
Merge pull request #2 from bernhardschaefer/master

Add cache directory to prevent IOExceptions
added WikipediaSimilarity411 dataset
wqMerge branch 'master' of https://github.com/marcocor/bat-framework
updated references to disambiguation pages
Updated references in the wikipediaSimilarity411 dataset from Cup to Mug
Merge remote-tracking branch 'upstream/master'