modify some views
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/pc/choose_doctor.html