shrine

Pull request #1407: Feature/SHRINE2020 1265c

Merge in SHRINE/shrine from feature/SHRINE2020-1265c to develop

* commit 'e5e6e4dbd74156cec6903df316150588db75ded7': (35 commits)
  SHRINE2020-1265 - Augment time gap to event relationship - renamed timeConstraint1 and timeConstraint2 to primaryTimeConstraint and secondaryTimeConstraint respectively
  SHRINE2020-1265 - Augment time gap to event relationship - renamed timeSpan1 and timeSpan2 to primaryTimeSpan and secondaryTimeSpan respectively
  SHRINE2020-1265 - Added unit tests for two time spans
  SHRINE2020-1265 - Code review changes from Dave
  SHRINE2020-1265 - Reduced font size of timeline link area in UI to reduce text wrapping
  SHRINE2020-1265 - Disable days if time span 1 is not enabled
  SHRINE2020-1265 - Fix reload of time span operator
  SHRINE2020-1265 - Removed magic strings and disable time span 2 if time span 1 is not selected
  SHRINE2020-1265 - Fixed extraction of second timespan data
  SHRINE2020-1265c - Refactored setting of time span
  SHRINE2020-1265c-Fixed layout of new time span fields
  SHRINE2020-1265 : rename timeSpan to timeSpan1 for compatibility with b/e. Not bug free however.
  SHRINE2020-1265 : add tests with a single event and 0 or 1 time spans
  SHRINE2020-1265 : add a test with a single event and two time spans, rename variable and JSON file names for clarity
  SHRINE2020-1265 : add to tests for the QEP service layer
  SHRINE2020-1265 : tweak test code and Timeline.scala as needed after adding second timespan
  Added support for 0, 1, or 2 span tags in i2b2 xml for SHRINE2020-1265
  SHRINE2020-1265 : commit WIP so Dave can work on it
  SHRINE2020-1265 : fix operator drop-down menu
  SHRINE2020-1265 : added operator menu
  ...