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

Conflicts:
	jemma.osgi.ah.webui.energyathome.demo/META-INF/MANIFEST.MF
	jemma.osgi.ah.webui.energyathome.demo/src/main/resources/webapp/ehdemo/js/dispositivi/Elettrodomestici2.js
	jemma.osgi.ah.zigbee/META-INF/MANIFEST.MF
	jemma.osgi.javagal.gui/META-INF/MANIFEST.MF
	jemma.osgi.javagal/META-INF/MANIFEST.MF
bug fix
Merge pull request #18 from Tophans/master

Fix Bug