branching rviz
cleanup
Merge branch 'rviz' of github.com:svanschooten/Grijper

Conflicts:
	src/rviz_gripper.cpp
	src/rviz_object.cpp