Add support for battery status in osx
Merge branch 'feature/osx-battery-support' into develop