shrine

Merge branch 'sso-phase2' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase2


 Conflicts:

	apps/shrine-api-app/src/main/scala/net/shrine/servlet/filter/AuthorizationFilter.scala