Conflicts: Gemfile app/controllers/courses_controller.rb app/views/attachments/_form.html.erb app/views/attachments/_form_course.html.erb app/views/files/_attachement_list.html.erb app/views/layouts/base.html.erb app/views/layouts/base_projects.html.erb config/locales/zh.yml public/javascripts/attachments.js