model changed
Merge branch 'master' of https://github.com/zentix/OBProject

Conflicts:
	OBProject/OBProject/DAL/OBModel.Designer.cs
	OBProject/OBProject/DAL/OBModel.edmx
	OBProject/OBProject/bin/OBProject.dll
	OBProject/OBProject/bin/OBProject.pdb
	OBProject/OBProject/obj/Debug/OBProject.dll
	OBProject/OBProject/obj/Debug/OBProject.pdb
	OBProject/OBProject/obj/Debug/TempPE/DAL.OBModel.Designer.cs.dll
	OBProject/OBProject/obj/Debug/edmxResourcesToEmbed/DAL/OBModel.csdl
	OBProject/OBProject/obj/Debug/edmxResourcesToEmbed/DAL/OBModel.ssdl
Merge branch 'master' of https://github.com/zentix/OBProject

Conflicts:
	OBProject/OBProject/DAL/OBModel.edmx
	OBProject/OBProject/bin/OBProject.dll
	OBProject/OBProject/bin/OBProject.pdb
	OBProject/OBProject/obj/Debug/OBProject.dll
	OBProject/OBProject/obj/Debug/OBProject.pdb
	OBProject/OBProject/obj/Debug/TempPE/DAL.OBModel.Designer.cs.dll
	OBProject/OBProject/obj/Debug/edmxResourcesToEmbed/DAL/OBModel.csdl