Break route screen changes; service stations added; bug fixing
Merge branch 'master' of https://github.com/nmarkovic04/Cykelsuperstier-fork