qw
Merge branch 'master' of github.com:lipin/lemon

Conflicts:
	app/models/product.rb