"Libre bootstrap"..add "Logout" to header.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
	src/main/webapp/WEB-INF/jsp/patient/newPatient.jsp