Merge pull request #1284 from yuhunglin/CLC-2123

[CLC-2123] Exposing friendly block messages in my activities feed.
[NOJIRA] Check is_acting_as before enabling ability to connect/disconnect tokens
Merge pull request #1285 from yuhunglin/NOJIRA

[NOJIRA] Check is_acting_as before enabling ability to connect/disconnect tokens
Bump app to v16
Merge pull request #1286 from ctweney/v16Bump

NOJIRA Bump app to v16
CLC-2178 Use the right timestamp field creating events; tweak tests to check for this
CLC-2178 Migration to de-duplicate notifications
Merge pull request #1287 from ctweney/clc-2178

CLC-2178 Eliminate duplicate Final-Grades activity entries
CLC-2178 Bump master branch's previous db version to latest version in qa branch
Merge pull request #1289 from ctweney/clc-2178-master-db-version-tweak

CLC-2178 Bump master branch's previous db version to latest version in qa branch
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