Merge branch 'master' into createChallenge

package-lock.json

package.json

src/components/MilestonePath/MilestonePath.vue

src/components/ProgressBar.vue

src/components/__tests__/InfoComponent.spec.ts

src/components/__tests__/MilestonePath.spec.ts

src/components/__tests__/ProgressBar.spec.ts

src/components/challenge/ActiveChallengeDisplay.vue

src/components/challenge/CompleteChallengePopUp.vue

src/components/challenge/PotentialChallengeDisplay.vue

src/stores/currentMilestone.ts

src/utils/MilestonePathUtils.ts

src/utils/MilestoneUtils.ts

src/utils/challengeutils.ts

src/utils/profileutils.ts

src/views/HomePage/ChallengeView.vue

src/views/HomePage/MilestonePathView.vue

src/views/RegisterPageView.vue