Merge branch 'master' of github.com:ipa-mdl/cob_manipulation
Merge remote branch 'origin-ipa320/master' into automerge
Merge remote-tracking branch 'origin-ipa320/master' into automerge
powerball changes
changes to support Powerball arm
Merge pull request #11 from ipa-tys/master

changes for Powerball arm