Merge branch 'Develop' of gitlab.c3sl.ufpr.br:portalmec/portalmec-react into Develop and fixed merge conflicts
