Merge branch 'master' of https://github.com/btj10/DIS_Kinect

Conflicts:
	multi_grab_frame.cpp
Merge branch 'master' of https://github.com/btj10/DIS_Kinect

Conflicts:
	multi_grab_frame.cpp
isRunning () added