Merge branch '平板管理—PadModel'

Conflicts:
app/assets/javascripts/application.js
app/models/company.rb
app/views/layouts/application.html.erb
config/initializers/assets.rb
config/routes.rb
db/schema.rb