Merge branch 'master' into createChallenge

package-lock.json

package.json

src/assets/base.css

src/components/MilestonePath/DirectTransfer.vue

src/components/MilestonePath/MilestoneDescription.vue

src/components/MilestonePath/MilestonePath.vue

src/components/MilestonePath/MilestoneProgress.vue

src/components/MilestonePath/PathNode.vue

src/components/ProgressBar.vue

src/components/__tests__/DirectTransfer.spec.ts

src/components/__tests__/MilestoneDescription.spec.ts

src/components/__tests__/MilestonePath.spec.ts

src/components/__tests__/MilestoneProgress.spec.ts

src/components/__tests__/PathNode.spec.ts

src/components/challenge/ActiveChallengeDisplay.vue

src/components/challenge/PotentialChallengeDisplay.vue

src/components/create-challenge/BaseInput.vue

src/components/create-challenge/BaseTextArea.vue

src/components/economy/TransactionComponent.vue

src/components/icons/image/AddImage.png