Merge branch 'main' of https://github.com/GreenButtonAlliance/openADE-task-force

Author: dfcoffin