yossi
Merge remote-tracking branch 'origin/master'

Conflicts:
	prophit-algo-factory/src/main/java/prophit/algos/impl/papa/Papa.java