Merge branch 'develop' into szzh

app/controllers/zipdown_controller.rb

@@ -1,4 +1,4 @@
-require 'zip'
+require 'zip'
 class ZipdownController < ApplicationController
   #查找项目（课程）
   before_filter :find_project_by_bid_id, :only => [:assort]
@@ -7,7 +7,7 @@ class ZipdownController < ApplicationController
   SAVE_FOLDER = "#{Rails.root}/files"
   OUTPUT_FOLDER = "#{Rails.root}/files/archiveZip"
 
-  #统一下载功能
+  #统一下载功能 
   def download
     if User.current.logged?
       begin

db/migrate/20150918063404_normal_homework_type.rb

@@ -4,5 +4,6 @@ class NormalHomeworkType < ActiveRecord::Migration
   end
 
   def down
+    HomeworkCommon.where("homework_type = 0").update_all(:homework_type => 1)
   end
 end