Merge remote-tracking branch 'origin/beta' into beta

# Conflicts:
#	dist/index.html
#	dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
#	src/components/pages/classroomObservation/components/analysis.vue
#	src/components/pages/classroomObservation/components/messageArea.vue