.
updated
Merge branch 'marc_new' into denny
Fixed Kinect