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

Conflicts:
	jemma.osgi.javagal/META-INF/MANIFEST.MF