Overrided the es_result method and added the build_es_query method
Merge branch '111155-case' of github.com:lwyszomi/commcare-hq into build_es_query
Remove uneeded code in es query
Merge pull request #3325 from dimagi/build_es_query

Merge in 3295 with minor changes
workaround for translations 500

http://manage.dimagi.com/default.asp?111525

this appears to have been introduced by https://github.com/dimagi/commcare-hq/commit/d165581746f82ed19ebb27b189f811223aa6f1e6
which made the incorrect assumption that the result of
`Translation.get_translations` was always a dict. Not knowing why the
change was made, this just works around the error
update dimagi-utils submodule
add views to location caching
avoid UnicodeEncodeErrors in the bookkeeper email
Merge pull request #3327 from dimagi/fix-bookkeeper-email

avoid UnicodeEncodeErrors in the bookkeeper email
Merge pull request #3326 from dimagi/case-111525

workaround for translations 500
Merge remote-tracking branch 'origin/multimedia-case-properties' into autostaging
Merge branch 'sql-dailyformstats' into autostaging
Merge remote-tracking branch 'origin/pretty-user-display' into autostaging
Merge remote-tracking branch 'origin/report-issue-upload' into autostaging
Merge branch 'commtrack-user' into autostaging
Merge remote-tracking branch 'origin/sms-translations' into autostaging
Merge remote-tracking branch 'origin/cache-locations' into autostaging
update submodule refs