header (C) fixes
Main/glue: update Makefile for Java sample, so that it can be used by humans
Main/glue/tests: clean up sample Java app using the glue code
moved