Merge remote-tracking branch 'upstream/master' into ui-tests
Merge branch 'ui-tests'
CLC-2736: IMPLEMENTATION: "Show More" buttons
https://jira.ets.berkeley.edu/jira/browse/CLC-2736
CLC-4015: Fix LiveReload

https://jira.ets.berkeley.edu/jira/browse/CLC-4015
CLC-4009 Client-side fix for various LTI-masquerade oddities
Merge pull request #2735 from christianv/CLC-4015

CLC-4015: Fix LiveReload
Merge pull request #2736 from raydavis/raywip

CLC-4009 Client-side fix for various LTI-masquerade oddities
Bumping version number to next release
Merge pull request #2718 from christianv/CLC-2736

CLC-2736: IMPLEMENTATION: "Show More" buttons
Merge pull request #2738 from raydavis/versionbump

Bumping version number to next release
CLC-3980 Adjust columns that show in ccadmin for calendar queue and log tables
CLC-4021: fixes for failing Selenium tests
CLC-4021: fixes for failing Selenium tests
CLC-4018: Replace ng- with data-ng-
https://jira.ets.berkeley.edu/jira/browse/CLC-4018
CLC-4021: fixes for failing Selenium tests, part 2
Merge pull request #2739 from ctweney/clc-3980

CLC-3980 Adjust columns that show in ccadmin for calendar queue and log tables
Merge pull request #2740 from christianv/CLC-4018

CLC-4018: Replace ng- with data-ng-
CLC-4022 Bearfacts proxies should clean up with the UserCacheExpiry
Ripping out files not intended for previous commits
Merge pull request #2742 from pfarestveit/my-fin-fixes

CLC-4021: fixes for failing Selenium tests