CLC-4008: Use ng-annotate instead of ng-min
https://jira.ets.berkeley.edu/jira/browse/CLC-4008
Merge pull request #2731 from christianv/CLC-4008

CLC-4008: Use ng-annotate instead of ng-min
Merge pull request #2734 from raydavis/raywip

CLC-4009 Block token changes when indirectly authenticated
CLC-4009 Client-side fix for various LTI-masquerade oddities