Commit MANIFEST
Nothing
Nothing
Merge branch 'master' of https://github.com/marcoNieddu/jemma

Conflicts:
	jemma.launch/javagal Windows.launch
	jemma.osgi.ah.adapter.http/build.properties
	jemma.osgi.ah.greenathome/META-INF/MANIFEST.MF
	jemma.osgi.ah.webui.energyathome.demo/META-INF/MANIFEST.MF
Manifest