#144: contact us and reporting units view changes
#144: contact us and reporting units view changes
Merge branch 'feature/144'
Merge branch 'master' into test