whitespace gitmodules
added commented out file
Merge branch 'submodulebase' into java/all

Conflicts:
	.gitmodules
	java/code/testdata