Small changes to make sure sr module compiles
Merge remote-tracking branch 'origin/sr' into sr

Conflicts:
	wikAPIdia-sr/src/main/java/org/wikapidia/sr/BaseLocalSRMetric.java
	wikAPIdia-sr/src/main/java/org/wikapidia/sr/disambig/MostSimilarDisambiguator.java
Skeleton for ESA