grim/guifications2

Merging
draft
2021-05-18, Gary Kramlich
32f3187d8abb
Merging
[branchname]
master = default
develop = develop
feature = feature/
release = release/
hotfix = hotfix/
support = support/