Format
Merge branch 'master' of https://github.com/vinid223/GestResto

Conflicts:
	GestResto/GestResto.UI/GestResto.UI.csproj
Merge branch 'master' of https://github.com/vinid223/GestResto