Return entire comment when creating new comment
Merge branch 'devel'