Cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/app/controllers/sellers_controller.rb