Complete the first draft for the map section.

docs/components/custom-apps/web-app/changelog.md

 # Changelog
 
-<<<<<<< HEAD
 ![Changelog](../../../assets/webapp/changelog.png)
 
-=======
->>>>>>> 9cd8b6e... Add doc for changelog and contact pages
 In order to keep our users updated with the latest features developped and bugs that have been fixed, we implemented a changelog feature.
 
 The component retrieves from the dedicated [service](../../services/changelog.md) the changelog of each released version from the most recent to the oldest.

docs/components/custom-apps/web-app/contact.md

 # Contact
 
-<<<<<<< HEAD
 ![Contact](../../../assets/webapp/contact.png)
 
-=======
->>>>>>> 9cd8b6e... Add doc for changelog and contact pages
 The contact page allow a user to contact the support team through the [email](../../services/mailer.md) service.
 
 When a user is not logged in, he/she will need to fill some personal information (firstname, lastname, email) in order for the support team to be able to reply. In the case he/she is logged in the information will already be completed.

docs/components/custom-apps/web-app/dataset/data.md

+<<<<<<< HEAD
 # Data
 
 This is the main page to observe the data of a dataset. This page has two components: a data table and a map. The map will be displayed only for geographical datasets (it makes sense).
 
 ![Data](../../../../assets/webapp/data.png)
+=======
+# Data 
+
+## Research in the data
+
+## Properties display toggle
+
+## Data table (sort properties & complex properties & history of the click elements)
+>>>>>>> 754d8f6... Complete the first draft for the map section.
 
 ## Fullscreen and Toggle Map/data
 
@@ -37,7 +47,11 @@ In case of datasets with a lot of properties, the user might want to display onl
 On the client side, the library [Mapbox GL JS](https://github.com/mapbox/mapbox-gl-js) is used. This is a very interesting tool improving quickly.
 Just for information the creator of Leaflet, Vladimir Agafonkin, is now working for Mapbox.
 
+<<<<<<< HEAD
 ### How is the map data fetched and displayed
+=======
+## How is the map data fetched and displayed ?
+>>>>>>> 754d8f6... Complete the first draft for the map section.
 
 The main difficulty to display correctly the data was the heterogeneity of the datasets, both in size and in types. For example we can have a dataset with millions of polygons to display, or a very small one but with personnalized icons instead of a geometric figure.
 To manage this very broad range of display we came with the following strategy.  
@@ -47,8 +61,11 @@ At the begigning, we wanted to display just one MVT layer. It's vector, fast and
 So first, **to display and see the data, the WMS service is used**. Using cache make it quite fast and we respect the style of the data producers.
 
 Then the question of the interaction. **To let the user interact with the map, we load the MVT layer**. The trick is to paint it transparent by default, and apply a color on hover or click events. The user has the feeling to interact directly with the features on the map (displayed by WMS), but in reality interacts with the MVT layer above it.
+<<<<<<< HEAD
 
 #### Restricted datasets
+=======
+>>>>>>> 754d8f6... Complete the first draft for the map section.
 
 For these datasets here is the rules: