wip
Merge branch 'master' into js_clean
adding comment now also adds commenter thumbnail