Conflicts: app/helpers/application_helper.rb app/views/at/show.json.erb app/views/layouts/new_base_user.html.erb
Conflicts: public/assets/wechat/class.html public/javascripts/wechat/controllers/class.js