Merge branch 'master' into uservoice-pending-invitations
Update the text when invitation is expired
Merge remote-tracking branch 'origin/master' into uservoice-pending-invitations

Conflicts:
	corehq/apps/style/static/style/lib/bootstrap-3.2.0
Merge branch 'master+uservoice-pending-invitations' of github.com:dimagi/commcare-hq into master+uservoice-pending-invitations
Merge remote-tracking branch 'origin/archive-products+explicit_case_processing' into autostaging
Merge remote-tracking branch 'origin/explicit_case_processing' into autostaging
Merge remote-tracking branch 'origin/master+schedule' into autostaging
Merge branch 'schedule' into autostaging
Merge remote-tracking branch 'origin/hq-dropdown' into autostaging
Merge branch 'refactor-domain-copy2' into autostaging
Merge remote-tracking branch 'origin/logos' into autostaging
Merge branch 'admin-reports' into autostaging
Merge remote-tracking branch 'origin/increase-es-timeout' into autostaging
Merge remote-tracking branch 'origin/archive-products' into autostaging
Merge remote-tracking branch 'origin/subscription-no-contact-info' into autostaging
Merge remote-tracking branch 'origin/fix-timeout' into autostaging
Merge branch 'custom_user_data' into autostaging
Merge remote-tracking branch 'lwyszomi/better_date_filters_improvment' into autostaging
Merge branch 'master+uservoice-pending-invitations' into autostaging
Merge remote-tracking branch 'origin/revert-4205-revert-3841-86347-2' into autostaging