modified:   app/controllers/sessions_controller.rb
Merge branch 'cheuks' of https://github.com/jason0037/vt into cheuks

Conflicts:
	.idea/vt.iml
	app/.DS_Store
	app/assets/.DS_Store
	app/controllers/admin/goods_controller.rb
	app/controllers/manco_controller.rb
	app/helpers/sessions_helper.rb
	app/views/manco/_addr_form.html.erb
	app/views/manco/black_good_index.html.erb
	app/views/manco/black_index.erb
	app/views/manco/blackboardfind_e.js.erb
	app/views/manco/blackbord.html.erb
	app/views/manco/departure.html.erb
	app/views/manco/departure_edit.html.erb
	app/views/manco/departure_new.html.erb
	app/views/manco/express.html.erb
	app/views/manco/find_manco.html.erb
	app/views/manco/follow.html.erb
	app/views/manco/good_source.html.erb
	app/views/manco/history.html.erb
	app/views/manco/index.html.erb
	app/views/manco/main.html.erb
	app/views/manco/show_carblack.html.erb
	app/views/store/cart/distribution_manco.html.erb
	app/views/store/cats/show.html.erb
	app/views/store/goods/mancoproduct.html.erb
	app/views/store/orders/edit_manco_addr.html.erb
	app/views/store/orders/new_manco.html.erb
	app/views/store/orders/new_manco_addr.html.erb
	config/routes.rb