comment collapse done
Merge branch 'collapsible-comment'