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

Conflicts:
	jemma.osgi.ah.zigbee.appliances/src/main/java/org/energy_home/jemma/ah/zigbee/appliances/ZclTemperatureHumidityAppliance.java