Send to Laptop
Send to Laptop
Merge origin/Manual into Manual

Conflicts:
	ChangeLog.rtf
	Transmission.log
	log4j.properties
	src/robot/Docs/Help/en/Grain/General/quickstart.html
	src/robot/Docs/Help/en/Grain/Panels/Panels.css
	src/robot/Docs/Help/en/Grain/Panels/Recipe.html
	src/robot/Docs/Help/en/Grain/Panels/Stall.html
	src/robot/Docs/Help/en/Grain/Panels/Template.html
	src/robot/Docs/Help/en/Grain/toc.xml
resolve conflict