Merge branch 'master' into dev
manifest: bumped version
affiliation: updated graphics for Omega
Merge branch 'dev'