Merge remote-tracking branch 'origin/dev/new1' into dev/new1

# Conflicts:
#	src/components/AssessResult/ScaleItem/index.jsx
#	src/components/PreviewBody/index.jsx