Merge pull request #259 from dimagi/mm-attachment-fix

safe save multimedia
nav hotfix for commtrack reports
Merge pull request #261 from dimagi/nav-hotfix

nav hotfix for commtrack reports
Merge branch 'master' of github.com:/dimagi/commcare-hq into staging2