Mer JS
Merge branch 'master' of https://github.com/boekfors/atHome2