Merge branch 'fLogin' of https://github.com/vauvenal5/pieShare into fLogin
Merge branch 'fLogin' into fBitTorrent
work on ITs (delete does not work yet)
work on file history
clean up
Merge branch 'fBitTorrent' of https://github.com/vauvenal5/pieShare into fBitTorrent
Merge branch 'fBitTorrent' into fLogin

Conflicts:
	pieShareApp/src/main/java/org/pieShare/pieShareApp/service/comparerService/ComparerService.java
	pieShareApp/src/main/java/org/pieShare/pieShareApp/service/database/DatabaseService.java
	pieShareApp/src/main/java/org/pieShare/pieShareApp/service/database/api/IDatabaseService.java
	pieShareApp/src/main/java/org/pieShare/pieShareApp/service/shareService/BitTorrentService.java
	pieShareApp/src/main/java/org/pieShare/pieShareApp/springConfiguration/PieShareApp/PieShareAppService.java
	pieShareApp/src/main/java/org/pieShare/pieShareApp/task/eventTasks/FileRequestTask.java
	pieShareAppIntegrationTests/src/test/java/pieShareAppITs/helper/config/PieShareAppServiceConfig.java