*Umm
Merge branch 'master' of github.com:skyudice/EnergyMan