Conflicts: public/assets/wechat/class.html public/javascripts/wechat/controllers/class.js
Conflicts: db/schema.rb