BugFix
BugFix
BugFix
Merge branch 'my-temporary-work'

Conflicts:
	jemma.osgi.ah.energyathome/src/main/java/org/energy_home/jemma/ah/ebrain/MeteringCore.java
	jemma.osgi.ah.greenathome/src/main/java/org/energy_home/jemma/ah/internal/greenathome/GreenathomeAppliance.java
	jemma.osgi.ah.webui.energyathome.demo/src/main/resources/webapp/ehdemo/conf/js/Configurazione.js
	jemma.osgi.ah.zigbee/src/main/java/org/energy_home/jemma/ah/internal/zigbee/ZigBeeManagerImpl.java
Added images