Lots of work on the new ref set form...
Merge branch 'develop'

* develop:
  Lots of work on the new ref set form...