added kinect functionality
fixed conflicts