aga version
aga version
aga
Merge branch 'master' of https://github.com/tmk1908/eLearning

Conflicts:
	App_Data/ASPNETDB.MDF
	App_Data/aspnetdb_log.ldf
	MasterPage.master
Admin Panel