Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/assets/base.css
#	src/components/magnetView.vue