merged in changes
Merge branch 'develop' of https://github.com/cmdunkers/m4atx_battery_monitor into develop