Returns lines instead of signs
Merge remote-tracking branch 'origin/master' into lignes

* origin/master:
  classes for labels
  Ajout labels on pin (parking)
  Add markerWithLabel library
  Add label functionnality
  readded index file.
  Modifications css + html
  Merge
  Display available parkings on the marker
  merge branch
  Add lines functionnality
  Modification CSS + Settings.js
  Modification du CSS + HTML index + markers
Merge remote-tracking branch 'origin/master' into lignes

* origin/master:
  Display errors in a popup
Merge remote-tracking branch 'origin/master' into lignes

* origin/master:
  Merge
  Integration lines traffic sign
Draw lines instead of signs
Lines don't cross streets anymore
Merge remote-tracking branch 'origin/master' into lignes

* origin/master:
  Changement des icones + css
  changement InfoWindow -> InfoBox
  Icone svg gear
  Changement du placeholder searchbox
  Added markers on line options
  Modifications CSS + icons
Change lines color
Fix setVisible of undefined
Initializing merge
Merge branch 'master' into static-html

Conflicts:
	routes/index.js
Merge completed