fixed branding
Merge branch 'gingerbread' into gingerbread-nocam