Report and email fixes
Merge branch 'master' of https://github.com/spkhillar/field-app