aaa
tset
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	chat/src/main/java/org/codiy/member/model/MemberDAO.java
	chat/src/main/java/org/codiy/member/model/MemberDTO.java