Revert "Merge branch 'master' into BCIS_KinectProject"
Revert "Merge branch 'master' into BCIS_KinectProject"

This reverts commit 9dd6b6098bd23ed6607d4ff5005439e2da7bb18e, reversing
changes made to dbf9e3bb3954018670e2f49b243f95ff0a4d6042.

stefanmarks/MotionServer,stefanmarks/MotionServer