list view and timeline troubleshooting
timer working
Merge branch 'Development' into merging