Timer displayed
timer bar added
Merge branch 'development'