fix date issue
Merge branch 's-hist' into staging2
Merge branch 'staging2' of github.com:dimagi/commcare-hq into staging2