Merge branch 'master' into database
Merge branch 'master' into jackson
Merge branch 'startup' of https://github.com/vauvenal5/pieShare into startup
Merge branch 'development' of github.com:vauvenal5/pieShare into development
Merge branch 'development' of https://github.com/vauvenal5/pieShare into development
Merge branch 'fFileCopy' into development
Merge branch 'development' into fLoginWorkflow
started rewriting MD5 hash
Merge branch 'fLoginWorkflow' of https://github.com/vauvenal5/pieShare into fLoginWorkflow
added hashTest
Merge branch 'fLoginWorkflow' of https://github.com/vauvenal5/pieShare into fLoginWorkflow
renamed hash test
Merge branch 'development' of https://github.com/vauvenal5/pieShare into development
Merge branch 'development' into fLoginWorkflow
Merge branch 'fLoginWorkflow' into development
Merge branch 'development' into fPwdEncryption
Merge branch 'fPwdEncryption' into development
Merge branch 'development' into startup
Merge branch 'startup' into development
Merge branch 'development' into jackson