.
erge branch 'master' of https://github.com/gporpino/depot

Conflicts:
	app/models/product.rb