Removing urdf_parser_py hack stuff
Merge branch 'hydro' into hydro-hyatt

Conflicts:
	hydro_ws/src/.rosinstall