minor
Merge branch 'shmaster' into remake

Conflicts:
	.classpath
	src/com/t/RubbishTest.java
minor after merges