shrine

Pull request #1372: Feature/SHRINE2020 1360

Merge in SHRINE/shrine from feature/SHRINE2020-1360 to develop

* commit '1665c0911492b59bdd56bc5125d4806f0feb951b':
  Comment in wrong file for SHRINE2020-1360
  Cleanup for SHRINE2020-1360
  Rename and new json encoder for query and result states for SHRINE2020-1360
  Big move before redefining the json for SHRINE2020-1360
  Last easy case object update I see for SHRINE2020-1360
  A first pass of SHRINE2020-1360 - better json for case objects