TeamFun branding for Ring Locker
Merge branch 'gingerbread' into gingerbread-nocam