Fixes some naming conflicts
Merge pull request #15 from thiagodefreitas/ros_i

Ros-I synchronization
Merge pull request #49 from ipa320/hydro-devel

Executable Naming issues