Merge branch 'development' of github.com:vauvenal5/pieShare into development
Merge branch 'development' of github.com:vauvenal5/pieShare into development
Merge branch 'development' of github.com:vauvenal5/pieShare into development
Merge branch 'development' of github.com:vauvenal5/pieShare into development
Merge branch 'development' of github.com:vauvenal5/pieShare into development
provider return cipher now
changed provider service to return cipher
Merge branch 'fEncryption' of https://github.com/vauvenal5/pieShare into fEncryption
Merge branch 'fEncryption' of github.com:vauvenal5/pieShare into fEncryption
Merge branch 'fEncryption' of github.com:vauvenal5/pieShare into fEncryption
fixed main scene
added fileEnryptionService
Merge branch 'fEncryption' of https://github.com/vauvenal5/pieShare into fEncryption
fixed cipher not init bug
Merge branch 'fEncryption' of https://github.com/vauvenal5/pieShare into fEncryption
fixed bug with startup in GUI
Merge branch 'fEncryption' of github.com:vauvenal5/pieShare into fEncryption
removed unneeded fileService from LoginTask
Merge branch 'fEncryption' of https://github.com/vauvenal5/pieShare into fEncryption
added simple message encryption