Fix merge
Merge branch 'master' of https://github.com/yadidl/Wpf-Project-Restaurant

Conflicts:
	ThePoject/WPFProject/BL/bin/Debug/BL.dll
	ThePoject/WPFProject/BL/bin/Debug/BL.pdb
	ThePoject/WPFProject/BL/bin/Debug/BussinnesEntity.dll
	ThePoject/WPFProject/BL/bin/Debug/BussinnesEntity.pdb
	ThePoject/WPFProject/BL/bin/Debug/DAL.dll
	ThePoject/WPFProject/BL/bin/Debug/DAL.pdb
	ThePoject/WPFProject/BL/bin/Debug/ProjectContext.dll
	ThePoject/WPFProject/BL/bin/Debug/ProjectContext.pdb
	ThePoject/WPFProject/BL/obj/Debug/BL.csproj.FileListAbsolute.txt
	ThePoject/WPFProject/BL/obj/Debug/BL.csprojResolveAssemblyReference.cache
	ThePoject/WPFProject/BL/obj/Debug/BL.dll
	ThePoject/WPFProject/BL/obj/Debug/BL.pdb
	ThePoject/WPFProject/BussinnesEntity/bin/Debug/BussinnesEntity.dll
	ThePoject/WPFProject/BussinnesEntity/bin/Debug/BussinnesEntity.pdb
	ThePoject/WPFProject/BussinnesEntity/obj/Debug/BussinnesEntity.dll
	ThePoject/WPFProject/BussinnesEntity/obj/Debug/BussinnesEntity.pdb
	ThePoject/WPFProject/DAL/bin/Debug/BussinnesEntity.dll
	ThePoject/WPFProject/DAL/bin/Debug/BussinnesEntity.pdb
	ThePoject/WPFProject/DAL/bin/Debug/DAL.dll
	ThePoject/WPFProject/DAL/bin/Debug/DAL.pdb
	ThePoject/WPFProject/DAL/bin/Debug/ProjectContext.dll
	ThePoject/WPFProject/DAL/bin/Debug/ProjectContext.pdb
	ThePoject/WPFProject/DAL/obj/Debug/DAL.csprojResolveAssemblyReference.cache
	ThePoject/WPFProject/DAL/obj/Debug/DAL.dll
	ThePoject/WPFProject/DAL/obj/Debug/DAL.pdb
	ThePoject/WPFProject/ProjectContext/Migrations/201410130902138_drop all tables.Designer.cs
	ThePoject/WPFProject/ProjectContext/Migrations/201410130902138_drop all tables.cs
	ThePoject/WPFProject/ProjectContext/Migrations/201410130902138_drop all tables.resx
	ThePoject/WPFProject/ProjectContext/Migrations/201410130904294_create all tables.Designer.cs
	ThePoject/WPFProject/ProjectContext/Migrations/201410130904294_create all tables.cs
	ThePoject/WPFProject/ProjectContext/Migrations/201410130904294_create all tables.resx
	ThePoject/WPFProject/ProjectContext/ProjectContext.csproj
	ThePoject/WPFProject/ProjectContext/bin/Debug/BussinnesEntity.dll
	ThePoject/WPFProject/ProjectContext/bin/Debug/BussinnesEntity.pdb
	ThePoject/WPFProject/ProjectContext/bin/Debug/ProjectContext.dll
	ThePoject/WPFProject/ProjectContext/bin/Debug/ProjectContext.pdb
	ThePoject/WPFProject/ProjectContext/obj/Debug/ProjectContext.csproj.FileListAbsolute.txt
	ThePoject/WPFProject/ProjectContext/obj/Debug/ProjectContext.csproj.GenerateResource.Cache
	ThePoject/WPFProject/ProjectContext/obj/Debug/ProjectContext.csprojResolveAssemblyReference.cache
	ThePoject/WPFProject/ProjectContext/obj/Debug/ProjectContext.dll
	ThePoject/WPFProject/ProjectContext/obj/Debug/ProjectContext.pdb
	ThePoject/WPFProject/Wpf/Kitchen/KitchenWindow.xaml.cs
	ThePoject/WPFProject/Wpf/bin/Debug/BL.dll
	ThePoject/WPFProject/Wpf/bin/Debug/BL.pdb
	ThePoject/WPFProject/Wpf/bin/Debug/BussinnesEntity.dll
	ThePoject/WPFProject/Wpf/bin/Debug/BussinnesEntity.pdb
	ThePoject/WPFProject/Wpf/bin/Debug/DAL.dll
	ThePoject/WPFProject/Wpf/bin/Debug/DAL.pdb
	ThePoject/WPFProject/Wpf/bin/Debug/ProjectContext.dll
	ThePoject/WPFProject/Wpf/bin/Debug/ProjectContext.pdb
	ThePoject/WPFProject/Wpf/bin/Debug/Wpf.exe
	ThePoject/WPFProject/Wpf/bin/Debug/Wpf.pdb
	ThePoject/WPFProject/Wpf/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ThePoject/WPFProject/Wpf/obj/Debug/Wpf.csproj.FileListAbsolute.txt
	ThePoject/WPFProject/Wpf/obj/Debug/Wpf.csprojResolveAssemblyReference.cache
	ThePoject/WPFProject/Wpf/obj/Debug/Wpf.exe
	ThePoject/WPFProject/Wpf/obj/Debug/Wpf.pdb
	ThePoject/WPFProject/Wpf/obj/Debug/Wpf_MarkupCompile.cache
	ThePoject/WPFProject/Wpf/obj/Debug/Wpf_MarkupCompile.i.cache
	ThePoject/WPFProject/Wpf/obj/Debug/Wpf_MarkupCompile.i.lref