no message
Merge branch 'ELearning' of https://github.com/RUPPWebDeveloper/Education into ELearning

Conflicts:
	ELearning/ELearning.v12.suo
	ELearning/ELearning/App_Data/education.mdf
	ELearning/ELearning/App_Data/education_log.ldf
	ELearning/ELearning/bin/ELearning.dll
	ELearning/ELearning/bin/ELearning.pdb
	ELearning/ELearning/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ELearning/ELearning/obj/Debug/ELearning.csproj.FileListAbsolute.txt
	ELearning/ELearning/obj/Debug/ELearning.csprojResolveAssemblyReference.cache
	ELearning/ELearning/obj/Debug/ELearning.dll
	ELearning/ELearning/obj/Debug/ELearning.pdb