refactor thumbnail setting and begin writing tests for it
Merge branch 'develop' into staff-views