FAIMS-421 - fix tool bar view
Merge branch 'master' of github.com:IntersectAustralia/faims-android