Merge branch 'hotfix-1-addWattsToDropDown' into develop
deleted BAK files that are nolonger required
Merge branch 'develop'