Fixed conflict
Fixed conflict
Merge branch 'distances' of https://github.com/nikicc/orange3 into distances
Merge branch 'distances' of https://github.com/nikicc/orange3 into distances
Merge branch 'distances' of https://github.com/marinkaz/orange3 into distances