Conflicts: app/views/users/_course_message.html.erb app/views/users/_project_issue.html.erb db/schema.rb