-fixed a bug where scrolling on the timeline tab would break teh calendar app's state
Merge remote-tracking branch 'upstream/master'
-fixed a bug where the grapher tab in bodytrack app could be in a broken state after viewing timeline tab in calendar app