Merge branch 'master' into database
Merge branch 'development' into database
Merge branch 'database' into development
Merge branch 'fFileServicePoll' of https://github.com/vauvenal5/pieShare into fFileServicePoll
Merge branch 'development' into fFileServicePoll
Merge branch 'fFileServicePoll' into development
Merge branch 'development' into fileService
Merge branch 'fileService' into development