BZ-12232 I would like to customize the primary logo used in estimates and proposals
Merge remote-tracking branch 'origin/integration' into integration
Merge branch 'branding-users' into integration