deleted gmaps ...
Merge branch 'master' of github.com:FSX/SportTracker
...
Fixed merging errors
Merge branch 'master' of github.com:FSX/SportTracker
11-8
Merge branch 'master' of github.com:FSX/SportTracker
Merge branch 'master' into activitiesStats
Added map to activiteiten tab
Merge branch 'master' of github.com:FSX/SportTracker
Merge branch 'master' into activitiesStats
Merge branch 'master' of github.com:FSX/SportTracker
Merge branch 'master' into activitiesStats
After upload, draw route implemented
test
Merge branch 'master' of github.com:FSX/SportTracker
Merge branch 'master' into activitiesStats
commit for merge
Merge branch 'master' of github.com:FSX/SportTracker
mergin conflicts