Merge origin/master into Shenal

Conflicts:
	src/Busko/JourneyBundle/Resources/config/routing.yml