Added thumbnail user
Merge branch 'master' into staging