Merge pull request #2 from gt-ros-pkg/hydro

Merge Groovy/Hydro branches