123
Merge branch 'master' of https://github.com/f3oal/goodsv4_app

Conflicts:
	app/models/good.rb
Change gemfile
settings add