Submdule
Merge pull request #3878 from dimagi/product-excel

Move product import to excel and fix some bugs
Merge branch 'master' into switch_to_site_code

Conflicts:
	corehq/apps/locations/bulk.py
update staging.yaml

[ci skip]
Merge branch 'restrict-parantage' into switch_to_site_code
Merge pull request #3875 from dimagi/restore-groups

add ability to restore a deleted group and more reasonable UX
Merge pull request #3868 from lwyszomi/reset-checkpoint

Add ability to reset pillow checkpoint by UI
Merge pull request #236 from dimagi/infinite-hierarchy

fix infinite recursion on case hierarchy generation + test
functionality to convert module to advanced module
also convert parent selection
append 'advanced' to name to better distinguish
Merge pull request #3794 from dimagi/formsql

use sofabed data for call center form stats
Fixed minor issue in example usage doc string

`hits` and `total` were being called as functions, but they are now properties.
update submodules
Added postgres XForm count
Merge pull request #3857 from dimagi/formfilter

don't use auto-load cases for form filtering
Merge pull request #3823 from dimagi/formviewbase

extract base view template for form view
remove sessions at end of tests
update sqlagg version
Merge pull request #3872 from dimagi/edit

better support for 'edit' in questionsSelect binding