allow user to login with username and correct updating of product for collections and admin can edit designer profile
commit
Merge branch 'master' of github.com:ksaleem/commissions

Conflicts:
	.rvmrc
	app/views/products/edit.html.erb
	db/schema.rb