Merge branch 'master' of https://github.com/gayazhan/OES

Conflicts:
	ExamBL/Reg_Subject_BL.cs
	ExamBL/bin/Debug/ExamBL.dll
	ExamBL/bin/Debug/ExamBL.pdb
	ExamBL/bin/Debug/ExamDAL.dll
	ExamBL/bin/Debug/ExamDAL.pdb
	ExamBL/bin/Debug/ExamPRT.dll
	ExamBL/bin/Debug/ExamPRT.pdb
	ExamBL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ExamBL/obj/Debug/ExamBL.csprojResolveAssemblyReference.cache
	ExamBL/obj/Debug/ExamBL.dll
	ExamBL/obj/Debug/ExamBL.pdb
	ExamDAL/Act_ExamMaster_DAL.cs
	ExamDAL/DAL.cs
	ExamDAL/Reg_Subject_DAL.cs
	ExamDAL/bin/Debug/ExamDAL.dll
	ExamDAL/bin/Debug/ExamDAL.pdb
	ExamDAL/bin/Debug/ExamPRT.dll
	ExamDAL/bin/Debug/ExamPRT.pdb
	ExamDAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ExamDAL/obj/Debug/ExamDAL.csprojResolveAssemblyReference.cache
	ExamDAL/obj/Debug/ExamDAL.dll
	ExamDAL/obj/Debug/ExamDAL.pdb
	ExamPRT/ExamPRT.csproj
	ExamPRT/Reg_Subject_PRT.cs
	ExamPRT/_Reg_Supervisor.cs
	ExamPRT/_Reg_Supervisor_Subject.cs
	ExamPRT/_Reg_SystemCategory.cs
	ExamPRT/_Reg_User.cs
	ExamPRT/bin/Debug/ExamPRT.dll
	ExamPRT/bin/Debug/ExamPRT.pdb
	ExamPRT/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ExamPRT/obj/Debug/ExamPRT.dll
	ExamPRT/obj/Debug/ExamPRT.pdb
	ExamService/bin/ExamBL.dll
	ExamService/bin/ExamBL.pdb
	ExamService/bin/ExamDAL.dll
	ExamService/bin/ExamDAL.pdb
	ExamService/bin/ExamPRT.dll
	ExamService/bin/ExamPRT.pdb
	ExamService/bin/ExamService.dll
	ExamService/bin/ExamService.pdb
	ExamService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ExamService/obj/Debug/ExamService.csproj.FileListAbsolute.txt
	ExamService/obj/Debug/ExamService.csprojResolveAssemblyReference.cache
	ExamService/obj/Debug/ExamService.dll
	ExamService/obj/Debug/ExamService.pdb
	Team6.suo
	Team6/bin/Team6.dll
	Team6/bin/Team6.pdb
	Team6/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Team6/obj/Debug/Team6.dll
	Team6/obj/Debug/Team6.pdb