Merge branch 'hotfix-1-addWattsToDropDown' into develop
Merge pull request #1 from Mason8r/develop

Merge branch 'hotfix-1-addWattsToDropDown' into develop