FAIMS-627 Show deleted users on search page
Merge branch 'master' of github.com:IntersectAustralia/faims-web
fixed bugs with formatter not properly dealing with null values
fixed broken tests
FAIMS-833 Add deleting and restoring of related entities
Merge branch 'master' of github.com:IntersectAustralia/faims-web
FAIMS-859: updated puppet script to update repo + added server update tasks
Merge branch 'master' of github.com:IntersectAustralia/faims-web
FAIMS-859: fixed bug with updating server