#master - refactored
#master - refactored
Merge branch 'master' of github.com:RosuMihaiAlexandru/TWProject

Conflicts:
	ITeamProject/ITeamProject/DAL/MasterEntities.Designer.cs
	ITeamProject/ITeamProject/DAL/MasterEntities.edmx
	ITeamProject/ITeamProject/DAL/RezervareRepository.cs
	ITeamProject/ITeamProject/bin/ITeamProject.dll
	ITeamProject/ITeamProject/bin/ITeamProject.pdb
	ITeamProject/ITeamProject/obj/Debug/ITeamProject.dll
	ITeamProject/ITeamProject/obj/Debug/ITeamProject.pdb
	ITeamProject/ITeamProject/obj/Debug/TempPE/DAL.MasterEntities.Designer.cs.dll
	ITeamProject/ITeamProject/obj/Debug/edmxResourcesToEmbed/DAL/MasterEntities.csdl
	ITeamProject/ITeamProject/obj/Debug/edmxResourcesToEmbed/DAL/MasterEntities.msl
	ITeamProject/ITeamProject/obj/Debug/edmxResourcesToEmbed/DAL/MasterEntities.ssdl