ya quedaron los botones de proveedores
Merge branch 'master' of https://github.com/NiuMedia/bride2be

Conflicts:
	dist/stylesheets/application.css
	www/stylesheets/application.css