added timers to timeline
Merge branch 'Development' into merging
convert timer button to label
Merge branch 'Development' of https://github.com/cgunarto/CAPSL into Development
merge resolved
scroll to soonest