Nouveau pictos
Merge branch 'master' into noGoogleMap

* master:
  Nouveau pictos