CLC-2179 Show 'BearFacts' instead of 'Campus'
CLC-2179 Correct case per Yu-Hung's feedback
Merge pull request #1291 from ctweney/clc-2179

CLC-2179 Show 'BearFacts' instead of 'Campus'
missing image assets

for unshared collection & video
Update _header.scss

include collection_list & video_list icons to bDrive popover
Conflicts:
	app/assets/stylesheets/_header.scss
Merge pull request #1293 from jonmhays/CLC-2204b

[CLC-2204] Missing images for videos and private collections
[NOJIRA] Commit noise cleanup
Merge pull request #1294 from yuhunglin/NOJIRA

[NOJIRA] Fixes for recent pulls
[CLC-2123] Touch-ups for block messages in my activities, aligning columns for block info in my academics
[CLC-2123] My academics with block messages
[CLC-2123] Fixes
Merge pull request #1295 from yuhunglin/CLC-2123

[CLC-2123] Block messages for My Activities, My Academics
[CLC-1676] Copy assets into public web directory
Merge pull request #1296 from yuhunglin/CLC-1676-copy

[CLC-1676] Copy assets into public web directory
[CLC-2123] Toggle open highligh accessibility for my academics -> blocks, other minor fixes
[CLC-2194] Undefined previous_id in CampusUserCoursesProxy during bug bash
Merge pull request #1300 from yuhunglin/CLC-2194

[CLC-2194] Undefined previous_id in CampusUserCoursesProxy during bug bash
Merge pull request #1298 from yuhunglin/CLC-2123

[CLC-2123] Toggle open highligh accessibility for my academics -> blocks, other minor fixes
CLC-2184 Give Canvas proxy its own sense of multiple terms
CLC-2198 Cache Links json at the controller level