sync
Merge branch 'master' of https://github.com/consoftenergyathome/jemma
fix view bug in conf page
Merge branch 'master' of https://github.com/consoftenergyathome/jemma
fix last bug in conf page
Merge pull request #3 from Tophans/master

Fix Bug in demo GUI (conf)
Merge pull request #176 from consoftenergyathome/master

fix bug in demo GUI, conf end frontend