FAIMS-633: updated database queries to use format function
Merge branch 'master' of github.com:IntersectAustralia/faims-android