sync
Merge branch 'master' of https://github.com/marcoNieddu/jemma

Conflicts:
	jemma.osgi.ah.webui.energyathome.demo/src/main/resources/webapp/ehdemo/js/dispositivi/Elettrodomestici2.js
sync
Merge branch 'master' of https://github.com/marcoNieddu/jemma
sync
Merge branch 'master' of https://github.com/marcoNieddu/jemma
sync
Merge branch 'master' of https://github.com/marcoNieddu/jemma
Merge pull request #21 from Tophans/master

Final