Ruéssite categ bd
Reussifasasdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	GestResto/GestResto.Logic/GestResto.Logic.csproj