move LOGGING after the localsettings import
maps report: pull case geopoint from linked location, if any
stuff on a map, with aggregation (and hack around bug)
PR cleanup
product select on maps page and ajax data reload
refactoring
stock category on client
get things behaving minimally-appropriately
fix map rendering issues and get non-commtrack maps working again
start at total up till date in cumulative charts; fix bug in trim data
Merge branch 'master' into commtrack-maps

Conflicts:
	corehq/apps/reports/commtrack/standard.py
	submodules/casexml-src
merge with master
set the creating user to the person who downloaded the domain
add lat/lon to location edit UI
Remove logging from test config
Explicitly install some test-only deps
use _.map
Merge branch 'master' into commtrack-maps
Remove couchlog from apps tested in the cchq build
fix error checking around UID