rarrange for ros hydro & indigo
remove duplicates from previous rearrange
Merge pull request #6 from githart/master

rarrange for ros hydro & indigo