Merge remote-tracking branch 'upstream/master' into ui-tests
Merge branch 'ui-tests'
CLC-3943, forcing the allowscreen attribute on the window in the most expedient and fool-proof way I can.
CLC-3965 - Added Ruby-Net-LDAP to Gemfile
CLC-3965 - Added LDAP connection settings
CLC-3965 - Added Canvas::Synchronization model, seeded canvas_synchronization table to store last guest user sync timestamp
CLC-3965 - Added Canvas::Ldap to query Guest OU in LDAP for updates and prepare for SIS User Import into Canvas
CLC-3965 - Added comments to Canvas::UserProvision concerning status as a dependency of the Add People tool
CLC-3965 - Setup cmdline script and Rake task - canvas:guest_user_sync
Merge pull request #2717 from redconfetti/CLC-3965-guest-refresh

CLC-3965 - Implement appropriate guest user refresh solution
CLC-2736: IMPLEMENTATION: "Show More" buttons
https://jira.ets.berkeley.edu/jira/browse/CLC-2736
CLC-3965 Remove Gemfile.lock junk from previous PR
Merge pull request #2719 from raydavis/raywip

CLC-3965 Remove Gemfile.lock junk from previous PR
CLC-3965 Fix chmod glitch from previous PR
Merge pull request #2720 from raydavis/raywip

CLC-3965 Fix chmod glitch from previous PR
CLC-4003: Optimize SVG images
https://jira.ets.berkeley.edu/jira/browse/CLC-4003
Merge pull request #2716 from elicochran/CLC-3943

CLC-3943, force the allowscreen attribute on the embedded app's parent window
Merge pull request #2721 from christianv/CLC-4003

CLC-4003: Optimize SVG images
CLC-3992: Semester page needs better messaging when user has only wait lists
https://jira.ets.berkeley.edu/jira/browse/CLC-3992
CLC-3949: Webcasts: on Safari, the volume control overlaps the tabs and the recording select
https://jira.ets.berkeley.edu/jira/browse/CLC-3949