work on history
more work on history
Merge branch 'fLogin' of https://github.com/vauvenal5/pieShare into fLogin
Merge branch 'fLogin' of https://github.com/vauvenal5/pieShare into fLogin
Merge branch 'fLogin' into fBitTorrent

Conflicts:
	pieShareApp/src/main/java/org/pieShare/pieShareApp/service/comparerService/ComparerService.java
	pieShareApp/src/main/java/org/pieShare/pieShareApp/service/database/api/IDatabaseService.java
	pieShareApp/src/main/java/org/pieShare/pieShareApp/service/fileService/api/IFileService.java
Database fixes
Merge branch 'fBitTorrent' of https://github.com/vauvenal5/pieShare into fBitTorrent
Merge branch 'fBitTorrent' into fLogin
fixed, added Login Test
added clean up
added test