Merge remote-tracking branch 'remotes/origin/developer' into developerB

# Conflicts:
#	src/main/resources/static/css/supplier-center/repair/detail.css