FIx problemas no merge

package-lock.json

package.json

src/App.js

src/Components/AreasSubPages.js

src/Components/Checkbox.js

src/Components/ColaborarModal.js

src/Components/ComponentAlterarAvatar.js

src/Components/FormInput.js

src/Components/FormValidationFunction.js

src/Components/Header.js

src/Components/IllegalContentModal.js

src/Components/LoadingSpinner.js

src/Components/LoginContainer.js

src/Components/LoginContainerFunction.js

src/Components/LoginModal.js

src/Components/MenuBar.js

src/Components/MenuList.js

src/Components/ModalAlterarAvatar.js

...onents/PageProfessorComponents/ModalConfirmarProfessor.js

src/Components/PageProfessorComponents/PartOne.js