user login
user login
Merge remote-tracking branch 'origin/master'

Conflicts:
	DoctorSpring/models/user.py
	DoctorSpring/util/constant.py
	DoctorSpring/views/forms.py
	DoctorSpring/views/user_center.py
	config.py
dbconfig
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	DoctorSpring/models/diagnoseDocument.py
	DoctorSpring/test/model.py
	DoctorSpring/views/user_center.py