Merge 2.3m/master

Conflicts:
	client/src/main/java/open/dolphin/helper/UserDocumentHelper.java
	client/src/main/java/open/dolphin/letter/AbstractLetterImpl.java
Merge 2.3m/master（手動マージ分）