Merge branch 'Develop' into 'telaRecurso'

# Conflicts:
#   src/Pages/UserPage.js

src/Pages/UserPage.js

@@ -22,6 +22,8 @@ import CustomizedBreadcrumbs from '../Components/TabPanels/Breadcrumbs.js'
 import { Store } from '../Store.js';
 import Tabs from '@material-ui/core/Tabs';
 import Tab from '@material-ui/core/Tab';
+import Paper from '@material-ui/core/Paper';
+
 import TabPanelAtividades from '../Components/TabPanels/UserPageTabs/PanelAtividades.js'
 import TabPanelMeusRecursos from '../Components/TabPanels/UserPageTabs/PanelMeusRecursos.js'
 import TabPanelFavoritos from '../Components/TabPanels/UserPageTabs/PanelFavoritos.js'
@@ -103,6 +105,13 @@ export default function UserPage (props){
             state.userIsLoggedIn?
             (
                 [
+                    <React.Fragment>
+                        <ModalAlterarAvatar
+                            open={modalOpen}
+                            handleClose={modalControl}
+                            userAvatar={state.currentUser.userAvatar}
+                        />
+
                     <BackgroundDiv>
 
                             <CustomizedBreadcrumbs
@@ -165,6 +174,7 @@ export default function UserPage (props){
                                 </Grid>
                             </Grid>
                         </BackgroundDiv>
+                    </React.Fragment>
                 ]
             )
             : (