Clean up branches and merge into noetic instead of master

[xwavex]

Depends on #22
Optional dependency on #20

• Activate Gripper again (adapted to new kinematic chain)
• Change default branch from master to noetic