Dairy dashboard changes
Merge branch 'master' of https://github.com/nirshandileep/DairyManager

Conflicts:
	Source/DairyManager/DairyManager/DairyManager.csproj