Merge commit '6dd068b0617c52ff36b687e896a0043eabfaa516'

Conflicts:
	client/src/main/java/open/dolphin/impl/labrcv/NLaboTestImporter.java
	client/src/main/java/open/dolphin/impl/lbtest/InFacilityLabo.java
	client/src/main/java/open/dolphin/impl/psearch/PatientSearchImpl.java
	client/src/main/java/open/dolphin/resources/Dolphin_ja.properties
	common/src/main/java/open/dolphin/infomodel/PatientModel.java