bug
Merge branch 'master' of github.com:hezejiang/EHR

Conflicts:
	Web/Manager/Log/20130622AppErrorLog.txt
	Web/Web.config