CLSN-1026product config - fr % store
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Generic/menus/Menu.cs
	UserInterface/Shared/scripts/router.js