timer fix
Merge branch 'develop' into feature/shoulder_ab