Merge branch 'buckybranch' of https://github.com/BeerSherpa/BeerSherpa into robert
UI nicities
prepare merge
merged