CLC-4230 - Accept either UID or SID in the View As field
CLC-4230 - Don't use AbstractModel
CLC-4227 - Can select "A+" in GPA calculator but it immediately flips back to "A"

https://jira.ets.berkeley.edu/jira/browse/CLC-4227
Merge pull request #3098 from christianv/CLC-4227

CLC-4227 - Can select "A+" in GPA calculator but it immediately flips back to "A"
CLC-4433: Selenium test for reg, res, and blocks
Removing extraneous logging
CLC-4408 - Tele-BEARS bCal events have event titles "I" and "II"

https://jira.ets.berkeley.edu/jira/browse/CLC-4408
Merge pull request #3099 from christianv/CLC-4408

CLC-4408 - Tele-BEARS bCal events have event titles "I" and "II"
Merge pull request #3086 from edwlook/CLC-4230

CLC-4230 - Accept either UID or SID in the View As field
Test clean-up
NOJIRA: extend Selenium Google timeout
Merge pull request #3100 from pfarestveit/status-blocks-test

CLC-4433: Selenium test for reg status, res status, and blocks
Merge pull request #3101 from pfarestveit/increase-google-timeout

NOJIRA: extend Selenium Google timeout