Merge branch 'master' of github.com:ipa-mdl/cob_manipulation
Merge remote branch 'origin-ipa320/master' into automerge
blacklist lwa package
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
updated default_collision_operations for cob3-3
Merge remote-tracking branch 'origin-ipa320/master' into electric_dev
Merge branch 'electric_dev'

Conflicts:
	cob_manipulation_config/powerball/collision_map_sources_kinect.yaml (solved)