Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/App.vue
#	src/components/magnetView.vue
#	src/components/magnets/magnetInfo.ts
#	src/components/magnets/timeMagnet.vue
#	src/types/magnetType.ts
#	src/util/pageHandle.ts
#	src/util/time.ts