Fine tuned kinect user recognition
merge conflicts solved