Merge branch 'master' into development
Working on thumbnails for offserver videos
Merge branch 'development'