Merge branch 'new_tabletop'

Conflicts:
	object_recognition_tabletop/README_Romeo
	object_recognition_tabletop/conf/detection.nao.object.ros.ork
	object_recognition_tabletop/conf/detection.nao.table.ros.ork
	tabletop/conf/detection.nao.object.ros.ork
	tabletop/conf/detection.nao.table.ros.ork
	tabletop/conf/detection.romeo.object.ros.ork
	tabletop/conf/detection.romeo.table.ros.ork
renaming README_Romeo into README.md and cleanup