make url use emwf format
minor clean-up
Do not touch local branches

This change avoids checking out local branches that do not already exist (except for the target "autostaging" branch of course), and tries to avoid moving the local trunk branch.
Correct EMWF users to display username_in_report
Merge pull request #3086 from dimagi/case-list-url

make url use emwf format
Merge pull request #3085 from dimagi/improve-rebuild-script

Do not touch local branches
Merge branch 'master' of github.com:dimagi/commcare-hq into fields-to-filters

Conflicts:
	corehq/apps/reports/commtrack/maps.py
	corehq/apps/reports/standard/cases/basic.py
Merge branch 'fields-to-filters' of github.com:dimagi/commcare-hq into fields-to-filters
Merge pull request #3087 from dimagi/emwf-user-display

Correct EMWF users to display username_in_report
Merge pull request #3089 from dimagi/fields-to-filters

Get rid of Fields
resolve merge conflict with master
Merge remote-tracking branch 'origin/attrib-fixture+fields-to-filters' into autostaging
Merge remote-tracking branch 'origin/daily_form' into autostaging
Merge branch 'attrib-fixture' into autostaging
Merge remote-tracking branch 'origin/vellum-includes' into autostaging
Merge remote-tracking branch 'origin/cloudcare-resume' into autostaging
Merge remote-tracking branch 'origin/multimedia-case-properties' into autostaging
Merge remote-tracking branch 'origin/settings-redo+feature-preview' into autostaging
Merge remote-tracking branch 'origin/phonelog-updates' into autostaging
update submodule refs