Changes

Summary

1. Removed some out-commented code.
2. Got handling of new-file-collision on server running!

Revision 408 by Marco Nguitragool-Schulze: Removed some out-commented code.
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeImpl.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/DuplicateCryptoRepoFileHandler.java
Revision 407 by Marco Nguitragool-Schulze: Got handling of new-file-collision on server running!
	/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/CollisionDto.java
	/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/sync/SsRepoToRepoSync.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptoRepoFileMerger.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeImpl.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/DuplicateCryptoRepoFileHandler.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/dto/CollisionDtoConverter.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/AssignCryptoRepoFileRepoFileListener.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/Collision.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CollisionDao.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoCryptoRepoFile.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoCryptoRepoFileDao.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoFileChunk.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoFileChunkDao.java
	/trunk/org.subshare/org.subshare.local/src/test/java/org/subshare/local/persistence
	/trunk/org.subshare/org.subshare.local/src/test/java/org/subshare/local/persistence/CollisionTest.java
	/trunk/org.subshare/org.subshare.test/src/test/java/org/subshare/test/CollisionRepoToRepoSyncIT.java