Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/welcome/course.html.erb

@@ -60,7 +60,7 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
   <h3><strong>新开课程</strong></h3>
-  <% if(find_miracle_course(10, 7,params[:school_id]).map.count == 0) %>
+  <% if(find_miracle_course(10, 7,params[:school_id]).count == 0) %>
       <span><%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1, :school_id => nil} %></span>
       <div class="d-p-projectlist-box">
         <ul class="d-p-projectlist">

db/migrate/20140508030039_create_attachmentstypes.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class CreateAttachmentstypes < ActiveRecord::Migration
   def self.up
     create_table :attachmentstypes do |t|