Merge branch 'szzh' into develop

Gemfile.lock

@@ -96,6 +96,8 @@ GEM
     execjs (2.2.1)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
+    faker (1.4.3)
+      i18n (~> 0.5)
     fastercsv (1.5.5)
     ffi (1.9.3)
     ffi (1.9.3-x86-mingw32)
@@ -314,6 +316,7 @@ DEPENDENCIES
   coderay (~> 1.0.6)
   coffee-rails (~> 3.2.1)
   factory_girl (~> 4.4.0)
+  faker
   fastercsv (~> 1.5.0)
   grape (~> 0.9.0)
   grape-entity

app/api/mobile/api.rb

@@ -1,5 +1,5 @@
 module Mobile
-
+  require_relative 'middleware/error_handler'
   class API < Grape::API
     version 'v1', using: :path
     format :json
@@ -33,7 +33,7 @@ module Mobile
     mount Apis::Homeworks
 
     #add_swagger_documentation ({api_version: 'v1', base_path: 'http://u06.shellinfo.cn/trustie/api'})
-     add_swagger_documentation ({api_version: 'v1', base_path: '/api'})
+     add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
 
   end
 end

db/schema.rb

@@ -12,7 +12,6 @@
 # It's strongly recommended to check this file into your version control system.
 
 ActiveRecord::Schema.define(:version => 20150123020615) do
->>>>>>> szzh
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false