Scroll view resizes to be larger than the viewport by the buffer minutes on either side.
Merge remote-tracking branch 'origin/lhTimeline-2' into lhTimeline-2

Conflicts:
	test/spec/directives/timelineSpec.js