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

Conflicts:
	Web/Manager/Log/20130620AppErrorLog.txt