Merge branch 'develop'
Update branding to odoo