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

Conflicts:
	.gitignore
	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
Changes on build.properties
Last commit