Adding new Grip command, and removing auto-grip/ungrip from calibrate/deenergize
Merge origin/master
Merge origin/master