595-57 partial commit
Merge branch 'master' of https://github.com/alter3go/SmartFridge