Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
startet implementing fileService
fileSystem removed PieFileInfo
Merge branch 'startup' of github.com:vauvenal5/pieShare into fileService

Conflicts:
	pieShareApp/src/main/java/org/pieShare/pieShareApp/controller/PieShareController.java
Merge branch 'master' into fileService
Fixed some file watcher Bugs
Merge branch 'fileService' of github.com:vauvenal5/pieShare into fileService
startet to fix file watcher witch own solution
reimplementing watcher
Merge branch 'fileService' of github.com:vauvenal5/pieShare into fileService
watcher works in linux os now
fixed in logger structure
fixed tree watching when rename folder
Merge branch 'fileService' of github.com:vauvenal5/pieShare into fileService
some fixes in recursive deleting