CB While v 0.5
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/sdc/util/ConstructionBuilder.java
fixes