Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/magnetView.vue
#	src/components/public/vueDrag.vue
#	src/util/domDrag.ts