Conflicts: app/views/homework_attach/_jour.html.erb app/views/homework_attach/_journal_reply_items.html.erb app/views/homework_attach/_showjour.html.erb app/views/words/_feedback.html.erb app/views/words/_journal_reply_items.html.erb app/views/words/_message.html.erb