Merge remote-tracking branch 'origin/master'

Conflicts:
	FridgeAndFoodManager.v12.suo
	FridgeAndFoodManager/Model/FAFDataModel.edmx.diagram
	FridgeAndFoodManager/View/MainView.xaml.cs
	FridgeAndFoodManager/bin/Debug/FridgeAndFoodManager.exe
	FridgeAndFoodManager/bin/Debug/FridgeAndFoodManager.pdb

	FridgeAndFoodManager/obj/Debug/FridgeAndFoodManager.csproj.FileListAbsolute.txt

	FridgeAndFoodManager/obj/Debug/FridgeAndFoodManager.csprojResolveAssemblyReference.cache
	FridgeAndFoodManager/obj/Debug/FridgeAndFoodManager.exe
	FridgeAndFoodManager/obj/Debug/FridgeAndFoodManager.pdb
	FridgeAndFoodManager/obj/Debug/FridgeAndFoodManager_MarkupCompile.cache

	FridgeAndFoodManager/obj/Debug/FridgeAndFoodManager_MarkupCompile.i.cache

	FridgeAndFoodManager/obj/Debug/TempPE/Model.FAFDataModel.Designer.cs.dll
	FridgeAndFoodManager/obj/Debug/TempPE/Model.FAFDataModel.cs.dll

	FridgeAndFoodManager/obj/Debug/edmxResourcesToEmbed/Model/FAFDataModel.csdl
	UnitTestProject/bin/Debug/FridgeAndFoodManager.exe
	UnitTestProject/bin/Debug/FridgeAndFoodManager.pdb
	UnitTestProject/bin/Debug/UnitTestProject.dll
	UnitTestProject/bin/Debug/UnitTestProject.pdb

	UnitTestProject/obj/Debug/UnitTestProject.csprojResolveAssemblyReference.cache
	UnitTestProject/obj/Debug/UnitTestProject.dll
	UnitTestProject/obj/Debug/UnitTestProject.pdb