Get a fresh merge with the original repo, no compilation error but I am not sure about the execution :p

Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	bin/index.sh
	conf/indexing.properties
	conf/server.properties
	core/src/main/java/org/dbpedia/spotlight/model/SpotlightConfiguration.java
	core/src/main/java/org/dbpedia/spotlight/model/SpotterConfiguration.java
	core/src/main/java/org/dbpedia/spotlight/spot/JAnnotationTokenizerFactory.java
	core/src/main/resources/log4j.properties
	core/src/main/scala/org/dbpedia/spotlight/model/OntologyType.scala
	core/src/main/scala/org/dbpedia/spotlight/model/SpotlightFactory.scala
	eval/pom.xml
	eval/src/main/scala/org/dbpedia/spotlight/evaluation/EvaluateParagraphDisambiguator.scala
	index/pom.xml
	index/src/main/java/org/dbpedia/spotlight/spot/cooccurrence/training/WiktionaryExtractor.java
	index/src/main/scala/org/dbpedia/spotlight/util/ExtractCandidateMap.scala
	pom.xml
	rest/pom.xml
	rest/src/main/java/org/dbpedia/spotlight/web/rest/OutputManager.java
	rest/src/main/java/org/dbpedia/spotlight/web/rest/output/Spot.java
	rest/src/main/java/org/dbpedia/spotlight/web/rest/resources/Candidates.java
	rest/src/main/java/org/dbpedia/spotlight/web/rest/resources/Disambiguate.java
	rest/src/main/java/org/dbpedia/spotlight/web/rest/resources/Spot.java