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

Conflicts:
	jemma.osgi.ah.webui.energyathome.demo/META-INF/MANIFEST.MF
Merge pull request #16 from Tophans/master

Demo Venezia