Merge branch 'master' of github.com:dimagi/commcare-hq into sql-dailyformstats
fix Location Import Status page hierarchy
display Commtrack Setup tabs for Location Import Status
Merge pull request #3221 from dimagi/location-import

include missing parts of Location Import Status page
Exclude admin and unknown users where appropriate
Merge remote-tracking branch 'origin/master' into sql-dailyformstats
fix a serious bug in the preindex refactor that broke syncdb for couchapps, mvp_apps, and fluff
Merge pull request #3223 from dimagi/syncdb-hotfix

fix a serious bug in the preindex refactor that broke syncdb for couchap...
defer get_db until after test harness has run
Merge pull request #3224 from dimagi/syncdb-hotfix-2

defer get_db until after test harness has run
move id_strings to their own file
add is_custom_app_string function

- register app string patterns
- check against a regex
do not auto fill custom translations

and move get_translations into app_manager
Merge branch 'daily_form' into autostaging
Merge branch 'vellum-includes' into autostaging
Merge branch 'multimedia-case-properties' into autostaging
Merge remote-tracking branch 'origin/sql-dailyformstats' into autostaging
Merge remote-tracking branch 'origin/case-list' into autostaging
Merge branch 'id-strings' into autostaging
update submodule refs