deleted:    wheeled_robin_description/urdf/wheeled_robin_properties.urdf.xacro
	modified:   wheeled_robin_bringup/launch/3dsensor.launch
	modified:   wheeled_robin_bringup/launch/includes/mobile_base.launch.xml
	modified:   wheeled_robin_bringup/launch/includes/mobile_base_fake.launch.xml
	modified:   wheeled_robin_description/urdf/wheeled_robin.urdf.xacro
	modified:   wheeled_robin_description/urdf/wheeled_robin_library.urdf.xacro
	modified:   wheeled_robin_bringup/launch/3dsensor.launch
	modified:   wheeled_robin_bringup/launch/includes/mobile_base.launch.xml
	modified:   wheeled_robin_bringup/launch/includes/mobile_base_fake.launch.xml
	modified:   wheeled_robin_description/urdf/wheeled_robin.urdf.xacro
	modified:   wheeled_robin_description/urdf/wheeled_robin_library.urdf.xacro
Merge branch 'hydro_devel' of http://github.com/robinJKU/wheeled_robin into hydro_devel

Conflicts:
	wheeled_robin_node/src/wheeled_robin_node/wheeled_robin_sensor_handler.pyc