Merge branch 'master' of git://github.com/dbpedia-spotlight/dbpedia-spotlight

Conflicts:
	.gitignore
	conf/indexing.properties
	conf/server.properties
	core/src/main/java/org/dbpedia/spotlight/lucene/analysis/PhoneticAnalyzer.java
	core/src/main/java/org/dbpedia/spotlight/lucene/disambiguate/MixedWeightsDisambiguator.java
	core/src/main/resources/log4j.properties
	core/src/main/scala/org/dbpedia/spotlight/io/FileOccurrenceSource.scala
	core/src/main/scala/org/dbpedia/spotlight/spot/opennlp/OpenNLPChunkerSpotter.scala
	core/src/main/scala/org/dbpedia/spotlight/util/AnnotationFilter.scala
	eval/src/main/java/org/dbpedia/spotlight/evaluation/external/ExtractivClient.java
	eval/src/main/java/org/dbpedia/spotlight/evaluation/external/OntosClient.java
	eval/src/main/scala/org/dbpedia/spotlight/evaluation/EvaluateDisambiguationOnly.scala
	eval/src/main/scala/org/dbpedia/spotlight/evaluation/ExtractTags.scala
	pom.xml
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   .gitattributes
#	new file:   .gitignore
#	modified:   .travis.yml
#	modified:   README.md
#	modified:   bin/download.sh
#	modified:   bin/index_db.sh
#	new file:   bin/unicodeEscape.py
#	modified:   conf/indexing.properties
#	modified:   conf/server.properties
#	new file:   conf/topic_descriptions.xml
#	modified:   core/pom.xml
#	modified:   core/src/main/java/org/dbpedia/spotlight/annotate/Annotator.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/disambiguate/CustomScoresDisambiguator.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/disambiguate/Disambiguator.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/exceptions/AnnotationException.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/exceptions/AuthenticationException.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/exceptions/ConfigurationException.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/exceptions/IndexException.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/exceptions/InputException.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/exceptions/ItemNotFoundException.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/exceptions/OutputException.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/exceptions/SearchException.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/exceptions/SparqlExecutionException.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/exceptions/TimeoutException.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/io/DataLoader.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/lucene/LuceneFeatureVector.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/lucene/analysis/PhoneticAnalyzer.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/lucene/disambiguate/LucenePriorDisambiguator.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/lucene/disambiguate/MixedWeightsDisambiguator.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/lucene/search/LuceneCandidateSearcher.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/lucene/search/SeparateOccurrencesContextSearcher.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/lucene/similarity/CachedInvCandFreqSimilarity.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/lucene/similarity/InvCandFreqSimilarity.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/lucene/similarity/JCSTermCache.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/lucene/similarity/NewSimilarity.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/lucene/similarity/TermCache.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/lucene/similarity/TermsFilter.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/model/CandidateSearcher.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/model/DisambiguatorConfiguration.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/model/SpotlightConfiguration.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/model/SpotterConfiguration.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/spot/KeaSpotter.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/spot/NESpotter.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/spot/NGram.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/string/WikiLinkParser.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/util/MemUtil.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/util/NewLogForEachRunFileAppender.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/util/RankingStrategy.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/util/bloomfilter/BloomFilterCalculations.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/util/bloomfilter/Factory.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/util/bloomfilter/ICompactSerializer.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/util/bloomfilter/LongBitSet.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/util/bloomfilter/LongBitSetSerializer.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/util/bloomfilter/LongFastBloomFilter.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/util/bloomfilter/MurmurHash.java
#	modified:   core/src/main/java/org/dbpedia/spotlight/util/bloomfilter/ReusuableObjectPool.java
#	modified:   core/src/main/scala/org/dbpedia/spotlight/annotate/DefaultAnnotator.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/DBCandidateSearcher.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/DBSpotter.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/DBTwoStepDisambiguator.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/FSASpotter.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/SpotlightModel.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/concurrent/TokenizerWrapper.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/disk/DiskStore.scala
#	new file:   core/src/main/scala/org/dbpedia/spotlight/db/disk/NTFileTypeMapper.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/memory/MemoryResourceStore.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/memory/MemoryStore.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/memory/MemorySurfaceFormStore.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/memory/MemoryTokenTypeStore.scala
#	renamed:    core/src/main/scala/org/dbpedia/spotlight/db/model/RawTokenizer.scala -> core/src/main/scala/org/dbpedia/spotlight/db/model/StringTokenizer.scala
#	renamed:    core/src/main/scala/org/dbpedia/spotlight/db/model/AnnotationTokenizer.scala -> core/src/main/scala/org/dbpedia/spotlight/db/model/TextTokenizer.scala
#	deleted:    core/src/main/scala/org/dbpedia/spotlight/db/model/TopicalPriorStore.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/similarity/GenerativeContextSimilarity.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/similarity/TFICFSimilarity.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/stem/SnowballStemmer.scala
#	renamed:    core/src/main/scala/org/dbpedia/spotlight/db/tokenize/BaseRawTokenizer.scala -> core/src/main/scala/org/dbpedia/spotlight/db/tokenize/BaseStringTokenizer.scala
#	renamed:    core/src/main/scala/org/dbpedia/spotlight/db/tokenize/BaseAnnotationTokenizer.scala -> core/src/main/scala/org/dbpedia/spotlight/db/tokenize/BaseTextTokenizer.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/tokenize/LanguageIndependentTokenizer.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/db/tokenize/OpenNLPTokenizer.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/disambiguate/CuttingEdgeDisambiguator.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/disambiguate/DefaultDisambiguator.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/disambiguate/MultiThreadedDisambiguatorWrapper.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/disambiguate/ParagraphDisambiguatorJ.scala
#	deleted:    core/src/main/scala/org/dbpedia/spotlight/disambiguate/TopicBiasedDisambiguator.scala
#	deleted:    core/src/main/scala/org/dbpedia/spotlight/disambiguate/TopicalDisambiguator.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/disambiguate/TwoStepDisambiguator.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/disambiguate/mixtures/Fader2Mixture.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/disambiguate/mixtures/FaderMixture.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/disambiguate/mixtures/LinearRegressionMixture.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/disambiguate/mixtures/Mixture.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/disambiguate/mixtures/OnlySimScoreMixture.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/disambiguate/mixtures/UnweightedMixture.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/extract/LuceneTagExtractor.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/extract/TagExtractor.scala
#	deleted:    core/src/main/scala/org/dbpedia/spotlight/filter/annotations/CombineAllAnnotationFilters.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/filter/annotations/ConfidenceFilter.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/filter/annotations/ContextualScoreFilter.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/filter/annotations/CoreferenceFilter.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/filter/annotations/SparqlFilter.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/filter/annotations/SupportFilter.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/filter/annotations/TypeFilter.scala
#	new file:   core/src/main/scala/org/dbpedia/spotlight/filter/visitor/FilterElement.scala
#	new file:   core/src/main/scala/org/dbpedia/spotlight/filter/visitor/FilterOccsImpl.scala
#	new file:   core/src/main/scala/org/dbpedia/spotlight/filter/visitor/FilterOccsVisitor.scala
#	new file:   core/src/main/scala/org/dbpedia/spotlight/filter/visitor/OccsFilter.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/io/AnnotatedTextSource.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/io/DisambiguationSource.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/io/FileOccurrenceSource.scala
#	new file:   core/src/main/scala/org/dbpedia/spotlight/io/NTripleSource.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/io/OccurrenceSource.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/io/TypeAdder.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/io/WikiPageSource.scala
#	new file:   core/src/main/scala/org/dbpedia/spotlight/log/SpotlightLog.scala
#	new file:   core/src/main/scala/org/dbpedia/spotlight/model/DBpediaCategory.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/model/DBpediaResourceFactory.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/model/DBpediaResourceOccurrence.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/model/Factory.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/model/OntologyType.scala
#	new file:   core/src/main/scala/org/dbpedia/spotlight/model/OntologyTypeMapper.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/model/Paragraph.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/model/Provenance.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/model/SpotlightFactory.scala
#	deleted:    core/src/main/scala/org/dbpedia/spotlight/model/Topic.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/spot/AtLeastOneNounSelector.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/spot/ChainedSelector.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/spot/NonCommonWordSelector.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/spot/SurfaceFormWhitelistSelector.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/spot/ahocorasick/AhoCorasickSpotter.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/spot/lingpipe/AnnotationTokenizerFactory.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/spot/lingpipe/LingPipeSpotter.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/spot/lingpipe/TokenizerRegEx.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/spot/opennlp/OpenNLPChunkerSpotter.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/string/ContextExtractor.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/string/WikiMarkupStripper.scala
#	deleted:    core/src/main/scala/org/dbpedia/spotlight/topics/TopicExtractor.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/util/AnnotationFilter.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/util/CreateLexicalizations.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/util/GetDBpediaResourceCandidates.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/util/KeywordExtractor.scala
#	deleted:    core/src/main/scala/org/dbpedia/spotlight/util/MathUtil.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/util/Profiling.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/util/TypesLoader.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/util/WebSearchConfiguration.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/util/YahooBossSearcher.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/vsm/FeatureVector.scala
#	modified:   core/src/main/scala/org/dbpedia/spotlight/vsm/FeatureVectorBuilder.scala
#	new file:   core/src/test/scala/org/dbpedia/spotlight/db/stem/SnowballStemmerTest.scala
#	modified:   core/src/test/scala/org/dbpedia/spotlight/disambiguate/MultithreadedDisambiguatorTest.scala
#	modified:   core/src/test/scala/org/dbpedia/spotlight/spot/JAnnotationTokenizerFactoryTest.scala
#	modified:   dist/pom.xml
#	modified:   dist/src/deb/control/control
#	deleted:    dist/src/deb/control/data/etc/dbpedia-spotlight/server.properties
#	deleted:    dist/src/deb/control/data/etc/init.d/dbpedia-spotlight
#	deleted:    dist/src/deb/control/data/usr/bin/dbpedia-spotlight
#	deleted:    dist/src/deb/control/data/usr/share/dbpedia-spotlight/index/_1.cfs
#	deleted:    dist/src/deb/control/data/usr/share/dbpedia-spotlight/index/_2.cfs
#	deleted:    dist/src/deb/control/data/usr/share/dbpedia-spotlight/index/_3.cfs
#	deleted:    dist/src/deb/control/data/usr/share/dbpedia-spotlight/index/segments.gen
#	deleted:    dist/src/deb/control/data/usr/share/dbpedia-spotlight/index/segments_5
#	deleted:    dist/src/deb/control/data/usr/share/dbpedia-spotlight/index/similarity-thresholds.txt
#	deleted:    dist/src/deb/control/data/usr/share/dbpedia-spotlight/pos-en-general-brown.HiddenMarkovModel
#	deleted:    dist/src/deb/control/data/usr/share/dbpedia-spotlight/spotter.dict
#	modified:   dist/src/deb/control/postinst
#	new file:   dist/src/deb/control/prerm
#	modified:   eval/pom.xml
#	modified:   eval/src/main/java/org/dbpedia/spotlight/evaluation/ExtractionEvaluator.java
#	modified:   eval/src/main/java/org/dbpedia/spotlight/evaluation/SpotterMemoryEvaluator.java
#	deleted:    eval/src/main/java/org/dbpedia/spotlight/evaluation/external/AlchemyClient.java
#	modified:   eval/src/main/java/org/dbpedia/spotlight/evaluation/external/AnnotationClient.java
#	modified:   eval/src/main/java/org/dbpedia/spotlight/evaluation/external/DBpediaSpotlightClient.java
#	modified:   eval/src/main/java/org/dbpedia/spotlight/evaluation/external/ExtractivClient.java
#	modified:   eval/src/main/java/org/dbpedia/spotlight/evaluation/external/HeadUpClient.java
#	modified:   eval/src/main/java/org/dbpedia/spotlight/evaluation/external/OntosClient.java
#	modified:   eval/src/main/java/org/dbpedia/spotlight/evaluation/external/OpenCalaisClient.java
#	modified:   eval/src/main/java/org/dbpedia/spotlight/evaluation/external/WMWikifyClient.java
#	modified:   eval/src/main/java/org/dbpedia/spotlight/evaluation/external/WikiMachineClient.java
#	deleted:    eval/src/main/java/org/dbpedia/spotlight/evaluation/external/ZemantaClient.java
#	modified:   eval/src/main/java/org/dbpedia/spotlight/string/XmlParser.java
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/corpus/KBPCorpus.scala
#	new file:   eval/src/main/scala/org/dbpedia/spotlight/corpus/SmallContextOccurrencesCorpus.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/BatchEvaluator.scala
#	new file:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/DBBaselineDisambiguator.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/DisambiguationEvaluator.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/DisambiguatorFactory.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/EvalParams.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/EvalSpotter.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/EvaluateBBCTranscripts.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/EvaluateDisambiguationOnly.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/EvaluateParagraphDisambiguator.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/EvaluatePredose.scala
#	new file:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/EvaluateSpotlightModel.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/EvaluateTagExtraction.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/ExtractTags.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/GenerateMatricesForAgreement.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/SetEvaluation.scala
#	new file:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/external/AlchemyClient.scala
#	new file:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/external/AnnotationClientScala.scala
#	new file:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/external/DBpediaSpotlightClientScala.scala
#	new file:   eval/src/main/scala/org/dbpedia/spotlight/evaluation/external/ZemantaClient.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/io/TrainingDataOutputGenerator.scala
#	modified:   eval/src/main/scala/org/dbpedia/spotlight/model/DisambiguationResult.scala
#	modified:   eval/src/test/java/org/dbpedia/spotlight/evaluation/external/AnnotationClientsTester.java
#	modified:   eval/src/test/java/org/dbpedia/spotlight/evaluation/external/WikiMachineClientTest.java
#	modified:   eval/src/test/scala/org/dbpedia/spotlight/evaluation/corpus/TestCorpora.scala
#	new file:   index/bin/dep.sh
#	new file:   index/bin/script.sh
#	modified:   index/pom.xml
#	new file:   index/script.sh
#	modified:   index/src/main/java/org/dbpedia/spotlight/lucene/index/BaseIndexer.java
#	modified:   index/src/main/java/org/dbpedia/spotlight/lucene/index/IndexEnricher.java
#	modified:   index/src/main/java/org/dbpedia/spotlight/lucene/index/OccurrenceContextIndexer.java
#	modified:   index/src/main/java/org/dbpedia/spotlight/lucene/index/SeparateOccurrencesIndexer.java
#	modified:   index/src/main/scala/org/dbpedia/spotlight/db/CreateSpotlightModel.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/db/MemoryStoreIndexer.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/db/SpotterTuner.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/db/WikipediaToDBpediaClosure.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/db/io/CandidateMapSource.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/db/io/DBpediaResourceSource.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/db/io/SurfaceFormSource.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/db/io/TokenOccurrenceSource.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/db/io/TokenSource.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/filter/occurrences/ContextNarrowFilter.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/filter/occurrences/ListPagesFilter.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/filter/occurrences/LowerCaseSurfaceFormsFilter.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/filter/occurrences/NumberResourcesFilter.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/filter/occurrences/OccurrenceFilter.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/filter/occurrences/RedirectResolveFilter.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/filter/occurrences/UriWhitelistFilter.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/io/AllOccurrenceSource.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/io/BzipUtils.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/io/DisambiguationContextSource.scala
#	new file:   index/src/main/scala/org/dbpedia/spotlight/io/FileOccsCategoriesSource.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/io/WebOccurrenceSource.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/io/WikiOccurrenceSource.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/io/WikiPageContextSource.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/lucene/index/AddCountsToIndex.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/lucene/index/AddSurfaceFormsToIndex.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/lucene/index/CompressIndex.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/lucene/index/ExtractOccsFromWikipedia.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/lucene/index/IndexMergedOccurrences.scala
#	new file:   index/src/main/scala/org/dbpedia/spotlight/lucene/index/IndexSplittedOccurences.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/lucene/index/PatchIndex.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/lucene/index/SplitTrainTest.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/spot/lingpipe/DumpLingPipeSpotterDict.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/spot/lingpipe/IndexLingPipeSpotter.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/util/ExtractCandidateMap.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/util/ExtractTopicSignatures.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/util/GetWebPriors.scala
#	modified:   index/src/main/scala/org/dbpedia/spotlight/util/IndexingConfiguration.scala
#	deleted:    lib/JDBM-3.0-alpha3.jar
#	deleted:    lib/cloud9.jar
#	deleted:    lib/dbpedia-2.0-SNAPSHOT-jar-with-dependencies.jar
#	deleted:    lib/dbpedia-extraction-core-3.8.jar
#	deleted:    lib/kea-goss-5.0-weka-3.7.3-SNAPSHOT.jar
#	deleted:    lib/kryo-2.11-all.jar
#	deleted:    lib/lingpipe-4.1.0.jar
#	deleted:    lib/nxparser-1.1.jar
#	deleted:    lib/scala-aho-corasick-0.1.jar
#	deleted:    lib/weka-trunk.jar
#	new file:   licenses/BSD 3-Clause.txt
#	new file:   licenses/BSD_XStream.txt
#	new file:   licenses/CDDL-v.1.1.txt
#	new file:   licenses/GPL-v.2.txt
#	new file:   licenses/LGPL-v.2.1.txt
#	new file:   licenses/LGPL-v.3.txt
#	new file:   licenses/Scala-license.txt
#	new file:   licenses/hsqldb.txt
#	modified:   licenses/lingpipe-license-1.txt
#	new file:   licenses/org.json.license.txt
#	new file:   live/pom.xml
#	new file:   live/src/main/resources/log4j.properties
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AAE/english_tagger_AAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AAE/english_tagger_indexerAAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AAE/hun_parser_tagger_indexerAAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AAE/hunstemchainAAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AAE/parser_langdet_indexerAAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AAE/parser_stemmer_indexerAAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AAE/parser_wst_hmmtagger_AAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AAE/parser_wst_indexerAAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AAE/testMLTcatAAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AAE/testTWEXAAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/LuceneCASIndexer.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/MLTcategoryAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/RegExAnnotator.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/articleCASFilterAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/articleIdExtractorAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/categoryExtractorAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/hmmtaggerAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/hunpostaggerAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/langrecogAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/posWordCollectorAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/szpparserAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/twowordextractorAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AE/wstAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AS/cas2luceneDD.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AS/hunpostaggerDD.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AS/szpparserDD.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AS/wikiprocessingDD.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/AS/wstDD.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CAS/ExternalConsumerAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CAS/FileSystemCollectionReader.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CAS/HTTPCollectionReader.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CAS/LuceneConsumerAE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CAS/WikiDumpCollectionReader.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CAS/WikiIRCCollectionReader.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CAS/XCASWriterCC.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CPE/HTTPCR_parser_wst_category_externalConsumer_CPE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CPE/en_HTTPCR_ParserPOSIndexer_CPE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CPE/en_WIRCCR_ParserStemmerIndexer_CPE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CPE/en_WdCR_ParserStemmerIndexer_CPE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CPE/en_WdCR_ParserStemmerIndexer_CPE_benchmark.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CPE/hun_WIRCCR_ParserStemmerIndexer_CPE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CPE/hun_WdCR_ParserPOSIndexer_CPE_benchmark.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CPE/hun_WdCR_ParserStemmerIndexer_CPE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CPE/hun_WdCR_ParserStemmerIndexer_CPE_benchmark.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/CPE/test_en_WdCR_ParserStemmerIndexer_CPE.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/descriptors/typeSystemDescriptor.xml
#	new file:   live/src/main/resources/pedia_uima_harvester/resources/articlefilter/en.nonarticle_title_prefixes.list
#	new file:   live/src/main/resources/pedia_uima_harvester/resources/articlefilter/hu.nonarticle_title_prefixes.list
#	new file:   live/src/main/resources/pedia_uima_harvester/resources/articlefilter/nonarticle_titles_prefixes.list
#	new file:   live/src/main/resources/pedia_uima_harvester/resources/articlefilter/redirects.list
#	new file:   live/src/main/resources/tiny.corpus.tsv
#	new file:   live/src/main/scala/org/dbpedia/spotlight/feed/DecoratorFeed.scala
#	new file:   live/src/main/scala/org/dbpedia/spotlight/feed/Feed.scala
#	new file:   live/src/main/scala/org/dbpedia/spotlight/feed/FeedListener.scala
#	new file:   live/src/main/scala/org/dbpedia/spotlight/feed/FeedRegistry.scala
#	new file:   live/src/main/scala/org/dbpedia/spotlight/feed/WikipediaUpdateFeed.scala
#	new file:   live/src/main/scala/org/dbpedia/spotlight/model/RssItem.scala
#	new file:   live/src/main/scripts/trec_corpus_downloader.sh
#	modified:   pom.xml
#	new file:   rest-tomcat/pom.xml
#	new file:   rest-tomcat/src/main/resources/tomcat_spotlight.properties
#	new file:   rest-tomcat/src/main/scala/org/dbpedia/spotlight/tomcat/SpotlightContextListener.scala
#	new file:   rest-tomcat/src/web/META-INF/context.xml
#	new file:   rest-tomcat/src/web/WEB-INF/web.xml
#	modified:   rest/pom.xml
#	modified:   rest/src/main/java/org/dbpedia/spotlight/web/rest/OutputManager.java
#	modified:   rest/src/main/java/org/dbpedia/spotlight/web/rest/Server.java
#	modified:   rest/src/main/java/org/dbpedia/spotlight/web/rest/SpotlightInterface.java
#	modified:   rest/src/main/java/org/dbpedia/spotlight/web/rest/resources/Annotate.java
#	modified:   rest/src/main/java/org/dbpedia/spotlight/web/rest/resources/Candidates.java
#	modified:   rest/src/main/java/org/dbpedia/spotlight/web/rest/resources/Disambiguate.java
#	modified:   rest/src/main/java/org/dbpedia/spotlight/web/rest/resources/Spot.java
#	modified:   rest/src/main/scala/org/dbpedia/spotlight/web/rest/NIFOutputFormatter.scala
#	modified:   rest/src/main/scala/org/dbpedia/spotlight/web/rest/OutputSerializer.scala
#	modified:   rest/src/main/scala/org/dbpedia/spotlight/web/rest/RelatedResources.scala
#	renamed:    rest/src/test/org/dbpedia/spotlight/web/client/RestApiTests.java -> rest/src/test/java/org/dbpedia/spotlight/web/client/RestApiTests.java
#	new file:   rest/src/test/scala/org/dbpedia/spotlight/web/rest/ServerTextSizeLimitTest.scala
#	new file:   topical/pom.xml
#	new file:   topical/src/main/java/org/dbpedia/spotlight/model/TopicalClassificationConfiguration.java
#	new file:   topical/src/main/java/org/dbpedia/spotlight/web/rest/TopicalServer.java
#	new file:   topical/src/main/java/org/dbpedia/spotlight/web/rest/resources/Topics.java
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/db/model/TopicalPriorStore.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/feed/RssTopicFeed.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/feed/WikiTopicInferenceFeed.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/model/Topic.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/model/TopicDescription.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/topical/NaiveBayesTopicalClassifier.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/topical/TopicalClassifier.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/topical/TopicalMultiLabelClassifier.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/topical/index/AssignTopicsToOccs.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/topical/index/GenerateOccTopicCorpus.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/topical/index/SplitOccsSemiSupervised.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/topical/util/TopicInferrer.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/topical/util/TopicUtil.scala
#	new file:   topical/src/main/scala/org/dbpedia/spotlight/web/rest/TopicalOutputSerializer.scala
#	new file:   topical/src/test/scala/org/dbpedia/spotlight/topical/opennlp/OpenNLPCategorizer.scala
#	new file:   uima/desc/SpotlightAnnotator.xml
#	new file:   uima/desc/SpotlightTypeSystemDescriptor.xml
#	new file:   uima/pom.xml
#	new file:   uima/src/org/dbpedia/spotlight/uima/SpotlightAnnotator.java
#	new file:   uima/src/org/dbpedia/spotlight/uima/response/Annotation.java
#	new file:   uima/src/org/dbpedia/spotlight/uima/response/Resource.java
#	new file:   uima/src/org/dbpedia/spotlight/uima/types/JCasResource.java
#	new file:   uima/src/org/dbpedia/spotlight/uima/types/JCasResource_Type.java
#