Update BatteryTest.php
Update MainController.php
Update Battery.orm.xml
Merge pull request #1 from maxmode/master

See todo(s) in code