Adding NNI perfromance test project
Resolving conflicts
Adding missing files