add midified files
Merge branch 'master' of  https://github.com/marcoNieddu/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
modified for jemma.osgi.ah.webui.energyathome.demo
Merge branch 'master' of https://github.com/marcoNieddu/jemma

Conflicts:
	jemma.launch/javagal Windows.launch
	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.javagal/src/main/java/org/energy_home/jemma/javagal/layers/data/implementations/IDataLayerImplementation/DataFreescale.java
	jemma.osgi.utils/META-INF/MANIFEST.MF
Merge branch 'master' of https://github.com/marcoNieddu/jemma

Conflicts:
	jemma.osgi.ah.webui.energyathome.demo/src/main/resources/webapp/ehdemo/js/InterfaceEnergyHome.js
merge last rev
merge last vers
merge last version
merge to last version
merge
Merge branch 'master' of https://github.com/marcoNieddu/jemma

Conflicts:
	jemma.launch/javagal Windows.launch
	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.greenathome/src/main/java/org/energy_home/jemma/ah/internal/greenathome/GreenathomeAppliance.java
	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.demo/src/main/resources/webapp/ehdemo/js/dispositivi/Elettrodomestici2.js
	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.javagal/src/main/java/org/energy_home/jemma/javagal/layers/data/implementations/SerialCommRxTx.java
	jemma.osgi.utils/META-INF/MANIFEST.MF
merge
Merge branch 'master' of https://github.com/marcoNieddu/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
sync
Merge branch 'master' of https://github.com/marcoNieddu/jemma
sync
Merge branch 'master' of https://github.com/marcoNieddu/jemma

Conflicts:
	jemma.launch/javagal Windows.launch
sync
Merge branch 'master' of https://github.com/marcoNieddu/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
sync