Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	patientview/src/main/webapp/body/messaging/messages_body.jsp
Merge remote-tracking branch 'origin/develop' into develop