Added timeline json stuff ...
Merge branch 'master' of github.com:stura-hftl/club-monitor