merge ROS Shell without integrated explorer part into trunk