Upgrade the MeteringCore.java to redure temporary the ReportAttributes for teh NILM project. Added support for the AirQualityIndex cluster (eKitchen project)
Merge pull request #135 from marcoNieddu/master

More stable version of the environment: many bugfixes and some new device supported
restored MeteringCore.java and finished the upgrade of the AirQualityIndex cluster
Merge branch 'master' of https://github.com/marcoNieddu/jemma
Changes on JavaGalGui
Changes on JavaGalGui
Added autorecovery on GAl
Changes on GAl GUI
Changes on javaGalGui
No changes
Merge branch 'master' of https://github.com/Tophans/jemma

Conflicts:
	jemma.osgi.ah.adapter.http/META-INF/MANIFEST.MF
	jemma.osgi.ah.app/META-INF/MANIFEST.MF
	jemma.osgi.ah.configurator/META-INF/MANIFEST.MF
	jemma.osgi.ah.energyathome/META-INF/MANIFEST.MF
	jemma.osgi.ah.felix.console.web/META-INF/MANIFEST.MF
	jemma.osgi.ah.greenathome/META-INF/MANIFEST.MF
	jemma.osgi.ah.hac.lib/META-INF/MANIFEST.MF
	jemma.osgi.ah.hac/META-INF/MANIFEST.MF
	jemma.osgi.ah.hap.client/META-INF/MANIFEST.MF
	jemma.osgi.ah.io/META-INF/MANIFEST.MF
	jemma.osgi.ah.m2m.device/META-INF/MANIFEST.MF
	jemma.osgi.ah.upnp.energyathome/META-INF/MANIFEST.MF
	jemma.osgi.ah.webui.base/META-INF/MANIFEST.MF
	jemma.osgi.ah.webui.energyathome.demo/META-INF/MANIFEST.MF
	jemma.osgi.ah.webui.energyathome/META-INF/MANIFEST.MF
	jemma.osgi.ah.zigbee.appliances.generic/META-INF/MANIFEST.MF
	jemma.osgi.ah.zigbee.appliances/META-INF/MANIFEST.MF
	jemma.osgi.ah.zigbee/META-INF/MANIFEST.MF
	jemma.osgi.javagal.gui/META-INF/MANIFEST.MF
	jemma.osgi.javagal.json/META-INF/MANIFEST.MF
	jemma.osgi.javagal.rest/META-INF/MANIFEST.MF
	jemma.osgi.javagal/META-INF/MANIFEST.MF
	jemma.osgi.utils/META-INF/MANIFEST.MF
Changed DoorLock GUI
Merge branch 'master' of https://github.com/marcoNieddu/jemma
Removed unused headers in manifest fixed artifact name for demo GUI
Added support for WindowCovering cluster
Added support for WindowCovering cluster - remaining files... :-(
Merge pull request #10 from andrearanalli/master

WindowCovering cluster support
Last changes
Merge branch 'master' of https://github.com/marcoNieddu/jemma
Changed threads priority