Completed beginner french part of manual.
Started Panels/Mainmenu
Merge origin/master

Conflicts:
	Silage/CowData.ser
	Silage/IngData.ser
	log4j.properties
	src/robot/Docs/Help/en/Grain/General/Setup/Ingredients.html
	src/robot/Docs/Help/fr/Grain/General/Setup/Connection.html
	src/robot/Docs/Help/fr/Grain/General/Setup/Ingredients.html
	src/robot/Docs/Help/fr/Grain/General/Setup/Other.html
	src/robot/Docs/Help/fr/Grain/General/features.html
	src/robot/Docs/Help/fr/Grain/General/quickstart.html
	src/robot/Docs/Help/fr/Grain/toc.xml