added commented out file
removed submodule
Merge branch 'submodulebase' into java/all

Conflicts:
	java/code/testdata