changes from cob3-6
Merge branch 'master' of github.com:ipa320/cob_object_perception into review-320
Merge branch 'review-320'
merge