Merge branch 'features/abcomm_sp6' of https://gitlab.agentec.jp/abook_android/abook_check into features/#42144_and_search

# Conflicts:
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ShopMemberDao.java