Conflicts: app/views/sub_document_comments/show.html.erb
Conflicts: app/controllers/sub_document_comments_controller.rb app/views/sub_document_comments/_show_newstyle.html.erb app/views/sub_document_comments/show.html.erb
Conflicts: app/views/sub_document_comments/_show_sub_document_newstyle.html.erb