fix timer class
fix
fix between method of Timer
fix timeline
fix
Merge branch 'feature/timer' into develop
build