Last Jemma integration
Bug Fix
Merge branch 'master' of https://github.com/marcoNieddu/jemma

Conflicts:
	jemma.launch/javagal Windows.launch