[CLC-1831] Seeing badges info for a student while using Act As
CLC-1830 Handle unparseable exam locations, and test for it
Merge pull request #1046 from yuhunglin/CLC-1831

[CLC-1831] Seeing badges info for a student while using Act As
Merge pull request #1047 from ctweney/clc-1830

CLC-1830 Handle unparseable exam locations, and test for it
[CLC-1692] Fixes for indicating author when != self
Merge pull request #1051 from yuhunglin/CLC-1692

[CLC-1692] Fixes for indicating author when != self
CLC-1813 Followup - change to syntax of async call
CLC-1833 Fix timing issue in Academics js controller
Merge pull request #1053 from shacker/CLC-1833

CLC-1833 Fix timing issue in Academics js controller
Merge pull request #1052 from ctweney/clc-1813-async

CLC-1813 Followup - change to syntax of async call
NOJIRA Eliminate "git status" noise on servers with compressed log files
Merge pull request #1054 from raydavis/raywip

NOJIRA Eliminate "git status" noise on servers with compressed log files
CLC-1820 Use visual button for show/hide block history
Merge pull request #1055 from shacker/CLC-1820

CLC-1820 Use visual button for show/hide block history
Merge branch 'master' into CLC-1761z

* master:
  CLC-1820 Use visual button for show/hide block history
  NOJIRA Eliminate "git status" noise on servers with compressed log files
  CLC-1833 Fix timing issue in Academics js controller
  CLC-1813 Followup - change to syntax of async call
  [CLC-1692] Fixes for indicating author when != self
  CLC-1830 Handle unparseable exam locations, and test for it
  [CLC-1831] Seeing badges info for a student while using Act As
test