Roomba added to library and revised
roomba revised contd.
Merge branch 'master' into service_robots

Conflicts:
	res/values/strings.xml
	src/robots/gui/RobotViewFactory.java