FAIMS-363 - fix bugs related to merge and show history
Merge branch 'master' of github.com:IntersectAustralia/faims-web