Branding
APP-54
APP-42
Merge branch 'feature/branding' into develop