Merge pull request #1 from nightscout/develop

Develop
add battery
Merge pull request #16 from ELUTE/develop

Develop