final usuarios
changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/app/views/sellers/new.html.erb