Hols
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bestnid/app/views/productos/index.html.erb
Merge branch 'master' of https://github.com/manusolito/Firestorm