Merge branch 'master' into nitrat-tester
Changed device skin
Merge branch 'ekotester' into ekotester-with-products