* static-maps: (33 commits)
  Add static map to ride comment.
  Adjust image size.
  Make images clickable.
  Add more static map images to timeline.
  First try for timeline at frontpage.
  Fix all the issues for Track entity.
  Also replace in timeline.
  Use in track list.
  Implement mapUrl function as twig extension.
  Some fixes.
  Fix polyline generation.
  Whatever. Remove all this old stuff.
  Remove all polyline tools.
  Add geobundle config.
  Fix username.
  This is useless.
  Fix import.
  Fix some parameters.
  Refactoring for TrackHandlingTrait
  WIP.
  ...

# Conflicts:
#	src/AppBundle/Resources/config/routing.yml

* master: (398 commits)
  Show ride title during cycle process.
  Done.
  Improve RideNamer choice in RideAdmin.
  Fix ride admin.
  Allow $description of Region entity to be null.
  Fixes for Track admin.
  Fixes for ride estimate admin.
  More fixes for PostAdmin, allow null values.
  Remove social networks from city admin.
  Fix Photo Admin.
  Allow nullable values.
  Remove social networks from city.
  Remove standardable fields from city.
  Allow nullable inputs.
  Remove unused imports.
  Allow to select ride namer.
  Add $rideNamer to City entity.
  Add counting namers.
  WIP.
  Fixes.
  ...

# Conflicts:
#	config/routes/criticalmass/routing.yml

* profile: (216 commits)
  Allow to escape asterisk.
  Remove unused StoreViewCommand.
  Add AbstractViewConsumer.
  Introduce ViewFactory.
  Resort all the classes.
  More fixes.
  Add RobustViewStorageCache with exception handling.
  Make connections lazy so they are not initialized right during service creation.
  Nasty fix.
  Enable headlines again.
  Bugfix.
  Remove old source.
  Move and reorder class structure.
  Work in progress.
  WIP.
  Fix typo.
  Heavy work in progress.
  Implement StreamListConverter.
  Much work in progress.
  Remove serializer annotations.
  ...