merge
Merge branch 'master' of https://github.com/biscmar/swisscom-IoT-gui
custom.js
Merge branch 'master' of https://github.com/biscmar/swisscom-IoT-gui
Merge branch 'master' of https://github.com/biscmar/swisscom-IoT-gui