Merge branch 'submodulebase' into java/all
added submodule test data for java
Merge branch 'master' into java/all

Conflicts:
	java/code/tests/org/keyczar/KeyczarToolTest.java