Add timeline views
Timeline finished
Merge branch 'dev' of https://github.com/Bergrebell/CyberCoach into MergeDev