Merge pull request #14 from ipa-mdl/electric

Master is now electric beta
Merge branch 'master' of github.com:ipa320/cob_manipulation