Initial 4
Merge branch 'LocalDietController'

Conflicts:
	DietController.WebUI/DietController.WebUI.csproj