Merge branch 'dev'
officescreen: font tweaking and simplifying
cantina: bugfix
Merge branch 'master' into dev
affiliation: bugfix for Omega
manifest: bumped version