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

Conflicts:
	DoctorSpring/templates/loginModal.html
	DoctorSpring/templates/loginPage.html