CLC-2179 Show 'BearFacts' instead of 'Campus'
CLC-2179 Correct case per Yu-Hung's feedback
CLC-2192 Use retriable to get around race conditions in first_or_create and first_or_initialize
Merge pull request #1292 from ctweney/clc-2192

CLC-2192 Use retriable to get around race conditions in first_or_create and first_or_initialize
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
NOJIRA ominauth-cas has gotten stricter about "host"
Our current host+path settings will trigger URI parsing errors
NOJIRA openssl now included in jruby
If explicitly included, may spew warnings about "already initialized constant"
CANVAS-75 Add LTI Provider support
CANVAS-75 Simple tool to exercise LTI code - WORK-IN-PROGRESS
CANVAS-75 LTI embedded view - WORK-IN-PROGRESS
CANVAS-75 LTI embedded view - WORK-IN-PROGRESS
CANVAS-75 Add initial roster photo files
NOJIRA DRY the stub_proxy spec helper method
CANVAS-75 Rough start at Canvas roster feeds - WORK-IN-PROGRESS
CANVAS-75 Fill Canvas roster feed context from session when embedded