Se agrego catalogo de electric porameters
Merge branch 'master' of https://github.com/SergioFdz/EsmIndustries

Conflicts:
	config/routes.rb