Merge origin/DB

Conflicts:
	src/java/StructAndData/main.java
Merge origin/DB into DB