Merge pull request #1 from ipa-fmw/indigo_dev

support for robot arg
Revert "support for robot arg"
Merge pull request #2 from thiagodefreitas/revert-1-indigo_dev

Revert "support for robot arg"
merge
Merge branch 'thiagodefreitas-indigo_dev' into indigo_dev