Merge branch 'indigo_dev' of github.com:ipa320/cob_manipulation into indigo_dev
updating self-collision matrix
updating controller namespaces
Merge pull request #3 from ipa-fxm/indigo_dev

update from fxm