Updated files
Merge branch 'master' of github.com:trancebeyond/depot

Conflicts:
	test/unit/product_test.rb