modify admin function
Merge remote-tracking branch 'origin/master'

Conflicts:
	proxy/hospital.js
modify admin function