Removed id argument from RvizMarkerManager
Remove redundant line
fix marker manager bug
Merge branch 'master' into peter_fiducial

Conflicts:
	usc_utils/usc_utilities/include/usc_utilities/rviz_marker_manager.h
	usc_utils/usc_utilities/src/rviz_marker_manager.cpp