cambios varios
Merge branch 'master' of http://github.com/energysistem/manuals