Merge branch 'master' into startup
add pieShareApp module
Merge branch 'master' into startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
fix in pieShareApp pom
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
fixed poms
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
working on first startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
added dependency
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
fixed startup
Merge branch 'startup' of github.com:vauvenal5/pieShare into startup
fixed few minor bugs
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