Merge branch 'GameficationAdmin' into luis_gamefication and fix conflicts

package-lock.json

src/Admin/Components/Components/AppBar.js

...Admin/Components/Components/DataCards/AchievementsCard.js

src/Admin/Components/Components/DataCards/ActionCard.js

...Admin/Components/Components/DataCards/GameficationCard.js

src/Admin/Components/Components/DataCards/RequirementCard.js

src/Admin/Components/Components/DisplayIcon.js

src/Admin/Components/Components/Inputs/CreateAchievements.js

src/Admin/Components/Components/Inputs/CreateAction.js

...min/Components/Components/Inputs/CreateItem/CompAddImg.js

...min/Components/Components/Inputs/CreateItem/CreateItem.js

src/Admin/Components/Components/Inputs/CreateItem/Cropper.js

.../Components/Components/Inputs/CreateItem/ModalAddPhoto.js

src/Admin/Components/Components/Inputs/CreateRequirement.js

src/Admin/Components/Components/Inputs/EditAchievement.js

src/Admin/Components/Components/Inputs/EditAction.js

...dmin/Components/Components/Inputs/EditItem/CompEditImg.js

src/Admin/Components/Components/Inputs/EditItem/Cropper.js

src/Admin/Components/Components/Inputs/EditItem/EditItem.js

...n/Components/Components/Inputs/EditItem/ModalEditPhoto.js