Merge branch 'master' into jackson
Merge branch 'startup' of https://github.com/vauvenal5/pieShare into startup
Merge branch 'development' into startup
Merge branch 'startup' into development
Merge branch 'development' into jackson
Merge branch 'jackson' into development