Merge branch 'master' of https://github.com/LichuanLu/redberry

Conflicts:
	DoctorSpring/views/diagnose.py
Merge branch 'master' of https://github.com/LichuanLu/redberry
Merge branch 'master' of https://github.com/LichuanLu/redberry

Conflicts:
	DoctorSpring/views/diagnose.py