refactored journeys colors and places
Merge branch 'master' into heroku