#master - moved classes to their respective places
#master
Merge branch 'master' of github.com:RosuMihaiAlexandru/TWProject

Conflicts:
	ITeamProject/ITeamProject/NeloProject.Website.csproj
	ITeamProject/ITeamProject/NeloProject.Website.csproj.user
	ITeamProject/ITeamProject/bin/ITeamProject.dll
	ITeamProject/ITeamProject/bin/ITeamProject.pdb
	ITeamProject/ITeamProject/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ITeamProject/ITeamProject/obj/Debug/ITeamProject.dll
	ITeamProject/ITeamProject/obj/Debug/ITeamProject.pdb
	ITeamProject/NeloProject.Core/App.config
	ITeamProject/NeloProject.Core/NeloProject.Core.csproj
	ITeamProject/NeloProject.Core/bin/Debug/EntityFramework.SqlServer.dll
	ITeamProject/NeloProject.Core/bin/Debug/EntityFramework.dll
	ITeamProject/NeloProject.Core/bin/Debug/EntityFramework.xml
	ITeamProject/NeloProject.Core/bin/Debug/NeloProject.Core.dll
	ITeamProject/NeloProject.Core/bin/Debug/NeloProject.Core.dll.config
	ITeamProject/NeloProject.Core/bin/Debug/NeloProject.Core.pdb
	ITeamProject/NeloProject.Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ITeamProject/NeloProject.Core/obj/Debug/NeloProject.Core.csprojResolveAssemblyReference.cache
	ITeamProject/NeloProject.Core/obj/Debug/NeloProject.Core.dll
	ITeamProject/NeloProject.Core/obj/Debug/NeloProject.Core.pdb
	ITeamProject/NeloProject.Core/obj/Debug/TempPE/DAL.MasterEntities.Designer.cs.dll
	ITeamProject/NeloProject.Core/obj/Debug/TempPE/DAL.MasterEntities.cs.dll
	ITeamProject/NeloProject.Core/obj/Debug/TempPE/DAL.MembershipModel.Designer.cs.dll
	ITeamProject/NeloProject.Core/obj/Debug/edmxResourcesToEmbed/DAL/MasterEntities.csdl
	ITeamProject/NeloProject.Core/obj/Debug/edmxResourcesToEmbed/DAL/MasterEntities.msl
	ITeamProject/NeloProject.Core/packages.config
	ITeamProject/NeloProject.Webservice/MasterWebService.asmx.cs
	ITeamProject/NeloProject.sln
	ITeamProject/NeloProject.v12.suo
	ITeamProject/WindowsEmailService/bin/Debug/WindowsEmailService.exe
	ITeamProject/WindowsEmailService/bin/Debug/WindowsEmailService.pdb
	ITeamProject/WindowsEmailService/obj/x86/Debug/WindowsEmailService.csprojResolveAssemblyReference.cache
	ITeamProject/WindowsEmailService/obj/x86/Debug/WindowsEmailService.exe
	ITeamProject/WindowsEmailService/obj/x86/Debug/WindowsEmailService.pdb
	ITeamProject/neloWebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ITeamProject/packages/repositories.config