Unify polymorph type names, fix import issues
Merge branch 'master' of github.com:uh-nmb/robotActionController