adding long timeout for xform pillow
Merge pull request #706 from dimagi/fixture-error-message

give a better error message when someone uploads fixtures with mislabele...
adding lowercasing of k,v on queries, lowercase domain.

on xform querybuilder add default kwarg for XFormInstance (ignoring other stuff)
Merge branch 'master' into app-manager-cosmetic-ui-changes-52356

Conflicts:
	corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media.html
	corehq/apps/hqwebapp/templates/hqwebapp/base.html
	corehq/apps/hqwebapp/templates/imports/hq-oldstyle-js.html
a few minor things
a few minor things
change defaults of some commcare properties
allow reports that extend basictabular to specify whether to run couchdb queries with stale='update_after'
Merge pull request #708 from dimagi/stale-aggregate

allow reports that extend basictabular to specify whether to run couchdb...
make a few final changes to the create snapshot form
merge master
add support for inherited columns in BasicTabularReport
Merge pull request #710 from dimagi/aggregate-columns

add support for inherited columns in BasicTabularReport
fix resend confirmation url
small change
Merge pull request #711 from dimagi/quickie

small change
make cloudcare more resilient to submission errors
settings validation
support user-data in cloudcare
Merge pull request #713 from dimagi/user-data-support

support user-data in cloudcare