Merge branch 'development' of https://github.com/vauvenal5/pieShare into development
Merge branch 'development' into fBitTorrent
Merge branch 'development' into fProtoGui
added database
fixes in db
clean up code
config fix
started work on delete files; added configuration for livelogging with lilith
deleting works... found problem with bitorrent out of ports
fixed out of ports bug by adding port semaphores
added regex service
Merge branch 'fBitTorrent' of https://github.com/vauvenal5/pieShare into fBitTorrent
Merge branch 'fBitTorrent' into fProtoGui

Conflicts:
	pieShareAppFx/src/main/java/org/pieShare/pieShareAppFx/springConfiguration/PieShareApp/PieShareAppService.java
added filter possibility
refactored a few things
some refactoring and bugfixes
refectored local task + add changed base task
added file filter
added filter GUI
fixed Filter Service, and some other bugs