Merge branch 'master' into ndev
knn now handles non-number attributes
Merge branch 'ndev'
Merge remote-tracking branch 'origin/master'