add thumbnails feature
add thumbnails feature
Merge branch 'feature-thumbnails' into develop
Merge branch 'develop'