修改了用户中心的jade文件
Merge remote-tracking branch 'origin/master'

Conflicts:
	ApplicationServer/controllers/user.js
	ApplicationServer/routes/routes.js
添加数据
Merge remote-tracking branch 'origin/master'

Conflicts:
	BusinessServer/controllers/hospital.department.js
	BusinessServer/controllers/hospital.doctor.js