Merge branch 'master' of github.com:dimagi/commcare-hq into fields-to-filters

Conflicts:
	corehq/apps/reports/commtrack/maps.py
	corehq/apps/reports/commtrack/standard.py
	corehq/apps/reports/fields.py
	corehq/apps/reports/filters/select.py
	corehq/apps/reports/standard/inspect.py
	corehq/apps/reports/standard/monitoring.py
	corehq/apps/reports/templates/reports/filters/single_option.html
	submodules/casexml-src
	submodules/phonelog