new file:   app/assets/javascripts/manco/handlebars.min.js
	modified:   app/controllers/store/cart_controller.rb
	modified:   app/models/ecstore/cart.rb
	modified:   app/models/ecstore/page.rb
	new file:   app/views/layouts/baoheng.html.erb
	modified:   app/views/manco/black_index.erb
	modified:   app/views/manco/blackbord.html.erb
	deleted:    app/views/manco/blackgood_add.html.erb
	modified:   app/views/manco/express.html.erb
	modified:   app/views/manco/find_manco.html.erb
	modified:   app/views/manco/good_source.html.erb
	modified:   app/views/manco/history.html.erb
	modified:   app/views/manco/index.html.erb
	modified:   app/views/manco/main.html.erb
Merge branch 'master' of https://github.com/jason0037/vt

Conflicts:
	app/models/ecstore/page.rb

	new file:   app/assets/javascripts/commissions.js.coffee
	new file:   app/assets/stylesheets/commissions.css.scss
	modified:   app/controllers/admin/wechat_controller.rb
	modified:   app/controllers/auth/weixin_controller.rb
	new file:   app/controllers/commissions_controller.rb
	modified:   app/controllers/home_controller.rb
	modified:   app/controllers/mobile_controller.rb
	modified:   app/controllers/patch/profiles_controller.rb
	modified:   app/controllers/sessions_controller.rb
	modified:   app/controllers/store/cart_controller.rb
	modified:   app/controllers/store/cats_controller.rb
	modified:   app/controllers/store/goods_controller.rb
	modified:   app/controllers/users_controller.rb
	modified:   app/controllers/vshop_controller.rb
	new file:   app/helpers/commissions_helper.rb
	modified:   app/models/ecstore/account.rb
	new file:   app/models/ecstore/commission.rb
	modified:   app/models/ecstore/page.rb
	modified:   app/models/ecstore/supplier.rb
	modified:   app/models/ecstore/wechat_follower.rb
	modified:   app/views/admin/suppliers/_form.html.erb
	modified:   app/views/admin/suppliers/index.html.erb
	modified:   app/views/admin/wechat/followers.html.erb
	new file:   app/views/commissions/bank_info.html.erb
	new file:   app/views/commissions/index.html.erb
	new file:   app/views/commissions/platform.html.erb
	modified:   app/views/layouts/mobile_new.html.erb
	modified:   app/views/layouts/norsh.html.erb
	modified:   app/views/layouts/tradev.html.erb
	modified:   app/views/layouts/vshop.html.erb
	modified:   app/views/layouts/vshop_wechat.html.erb
	modified:   app/views/mobile/user.html.erb
	modified:   app/views/sessions/new_mobile.html.erb
	renamed:    app/views/store/goods/mobile.html.erb -> app/views/store/goods/mproduct.html.erb
	modified:   app/views/vshop/members.html.erb
	modified:   config/columns/member.yml
	modified:   config/routes.rb
	new file:   db/migrate/20140908011321_add_commission_to_suppliers.rb
	new file:   db/migrate/20140908090851_add_supplier_id_to_accounts.rb
	new file:   db/migrate/20140908094425_create_table_commissions.rb
	modified:   db/schema.rb