Merge pull request #760 from christianv/CLC-1351

CLC-1351 - Fix the CalLink site_url
CLC-1372 - Implement next iteration of the Academic Status popover
https://jira.media.berkeley.edu/jira/browse/CLC-1372