shrine

Pull request #1465: Feature/SHRINE2020 1529

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

* commit 'f58eb590708095d3f8fe4ffa6e8d8fc25b43c451':
  Now with just one header line for SHRINE2020-1529
  Correct time in column names for SHRINE2020-1529
  More columns for SHRINE2020-1529
  Fixed a minor bug in the 'time in' business while working through SHRINE2020-1529
  Refactored the network tool to use Columns for SHRINE2020-1529