Changed class name APP-> Knn_API. and some minor changes i forgot :p
Fixed merge conflicts