backup
refactoring clone
Merge branch 'master' into clone

Conflicts:
	src/be/kuleuven/cs/distrinet/chameleon/util/Util.java
Java tests pass again.
backup
refactoring clone