Unit tests complete
Added store display for customers
Merge remote-tracking branch 'origin/master'

Conflicts:
	depot/app/models/product.rb
	depot/test/functional/products_controller_test.rb