some cleaning
Merge branch 'hydro-devel' of https://github.com/robotics-in-concert/rocon_concert into hydro-devel
merging with hydro-devel