Updated views
Merge branch 'master' of github.com:walterlatimer/rainforest

Conflicts:
	app/views/products/admin.html.erb