Commit for pull
Merge remote-tracking branch 'origin/sr' into sr

Conflicts:
	wikAPIdia-cookbook/src/main/java/org/wikapidia/phrases/cookbook/CosimilarityMatrixExample.java