* master: (83 commits)
  Use Strava icon for track import instead of map icon.
  Allow asset versioning.
  Fix brand icons.
  Remove font-awesome 4.70
  Change extramarkers prefix from fa to far
  generic fa
  fa-map-marker
  fa-file-text
  fa-location-arrow
  fa-bicycle
  fa-university
  fa-forward
  fa-play
  fa-stop
  fa-pause
  fa-backward
  fa-browser
  fa-facebook
  fa-runkeeper
  fa-strava
  ...

* master: (242 commits)
  Add more documentation.
  Minor fixes for rides.
  StartValueParameterTest for cities.
  Fix OrderByParameterTest.
  CityApiTest.
  Fix property types.
  OrderByDistanceTest.
  OrderByParameterTest.
  Use this as keywords for a while. Will change that later.
  Adjust hamburg city api output.
  More test adjustments.
  Adjust tests.
  Fix elastic env parameter.
  Small fixes.
  Place shell script instead.
  Remove CriticalDriver and CriticalPlatform again.
  Fix stuttgart region.
  Add more cities.
  Add RegionFixtures.
  This does not work: https://coderwall.com/p/staybw/workaround-for-1701-cannot-truncate-a-table-referenced-in-a-foreign-key-constraint-using-doctrine-fixtures-load-purge-with-truncate
  ...

# Conflicts:
#	config/packages/flagception.yaml