rearranging
Merge branch 'develop' of https://github.com/meriadec/FollowMyTracks into develop
Merge branch 'develop' of https://github.com/meriadec/FollowMyTracks into develop