Updated Basic Components
Merge branch 'master' into MFFS-3.1.0
Made Force Manipulator work