current work
added Tracking Service + some Fixes
Merge branch 'feature/logbook-features' into develop