shows de configuraciones
Merge branch 'master' of https://github.com/carloslfuentes/propymes

Conflicts:
	app/views/p_config/products/index.html.haml