popopop c'est la vue
corrected blinking
Merge branch 'develop' of https://github.com/H4412/GHOME into feature/map_integration
Merge branch 'feature/map_integration' of github.com:H4411/GHOME into feature/map_integration
Merge branch 'feature/map_integration' of github.com:H4411/GHOME into feature/map_integration
Added map to views
Merge branch 'feature/map_integration' into develop