CLC-2051 - Update the limit for the badge popovers to 25
https://jira.media.berkeley.edu/jira/browse/CLC-2051

Also fixes CLC-1962
Folders are showing up with the wrong icon in bDrive drop-down
https://jira.media.berkeley.edu/jira/browse/CLC-1962
Merge pull request #1186 from christianv/CLC-2051

CLC-2051 - Update the limit for the badge popovers to 25