Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mybatis/CareWalkingDistanceHourStaMapper.xml