Merge branch 'Develop' into 'gamification'

package-lock.json

package.json

src/App.js

src/Components/Activities/Definitions.js

src/Components/ActivityListItem.js

src/Components/AreasSubPages.js

src/Components/ButtonGuardarColecao.js

src/Components/CardOptions.js

src/Components/CollectionCardFunction.js

src/Components/ComponentAlterarAvatar.js

src/Components/ContactButtons/FollowButton.js

src/Components/ContactButtons/FollowersCountButton.js

src/Components/ContactButtons/FollowingButton.js

src/Components/ContactCard.js

src/Components/ContactCardOptions.js

src/Components/ContactForm.js

src/Components/Cropper.js

src/Components/FormInput.js

src/Components/Header.js

src/Components/HelpCenter/Cards/CardEncontrando.js