Sample Panda (Sencha)
Merge branch 'LocalDietController'

Conflicts:
	DietController.WebUI/DietController.WebUI.csproj
	DietController.WebUI/scripts/pandaApp.js