Changes for logging
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/ds/node/Node.java