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 'cluster' of https://github.com/vauvenal5/pieShare into cluster
Merge branch 'master' into cluster
Merge branch 'master' into fileService
Update README.md

added travis badge
added build badges 2nd try
Merge branch 'master' of https://github.com/vauvenal5/pieShare
Fixed some file watcher Bugs
Merge branch 'fileService' of github.com:vauvenal5/pieShare into fileService
Merge branch 'startup' into fCmdService
some heavy refactoring
Merge branch 'cluster' into fCmdService