Refactor Image creator
Merge branch 'develop' of https://github.com/SeanHurley/AndroidSolarPanelManager into develop