FAIMS-799 Fix ordering issue
Merge branch 'master' of github.com:IntersectAustralia/faims-android