Added efficiency to battery charge and discharge.
Merge remote-tracking branch 'refs/remotes/origin/master'