家庭档案列表模块
Merge branch 'master' of github.com:hezejiang/EHR

Conflicts:
	.gitignore
	DALFactory/obj/Debug/DALFactory.csproj.FileListAbsolute.txt
	IDAL/obj/Debug/IDAL.csproj.FileListAbsolute.txt
	SQLServerDAL/obj/Debug/SQLServerDAL.csproj.FileListAbsolute.txt
	Web/Manager/Log/20130608AppErrorLog.txt
	Web/Manager/Module/FrameWork/HealthRecords/DeathRegistration/default.aspx
	Web/Manager/Module/FrameWork/HealthRecords/DeathRegistration/default.aspx.cs
	Web/Manager/Module/FrameWork/HealthRecords/DeathRegistration/default.aspx.designer.cs