modified:   app/assets/javascripts/store/new_base.js
	modified:   app/assets/stylesheets/standard.css
Merge branch 'cheuks' of https://github.com/jason0037/vt into cheuks

Conflicts:
	app/controllers/admin/goods_controller.rb