Commit previo a merge - JLC
Merge branch 'master' of https://github.com/jlcafferata/energtel

Conflicts:
	db/db_energtel.ldb
	db/db_energtel.mdb
Commit para merge - JLC
Modificacion de estructura de tabla materiales - JLC