Add Edit Product Fields Model view
Enable custom data for products
Add management command for product data
Add ability to import/export custom product data
Merge branch 'master' into custom_product_data

Conflicts:
	corehq/apps/commtrack/models.py
	corehq/apps/commtrack/views.py
Merge branch 'custom_product_data' into archive-programs+custom_product_data

Conflicts:
	corehq/apps/commtrack/views.py
Merge remote-tracking branch 'origin/master' into archive-programs+custom_product_data

Conflicts:
	corehq/apps/commtrack/bulk.py
@twymer What do you think of my resolution?
Merge remote-tracking branch 'origin/jsonobject-0.6.0b2' into autostaging
Merge remote-tracking branch 'origin/explicit_case_processing' into autostaging
Merge remote-tracking branch 'origin/master+schedule+schedule' into autostaging
Merge remote-tracking branch 'origin/hq-dropdown' into autostaging
Merge remote-tracking branch 'origin/logos+master' into autostaging
Merge branch 'archive-programs+custom_product_data' into autostaging
Merge remote-tracking branch 'origin/subscription-no-contact-info' into autostaging
Merge remote-tracking branch 'origin/revert-4205-revert-3841-86347-2' into autostaging
Merge remote-tracking branch 'origin/bulk-app-translate' into autostaging
Merge branch 'callcenter' into autostaging
Merge remote-tracking branch 'origin/archive-products+explicit_case_processing+ota-restore-caching' into autostaging
Merge remote-tracking branch 'origin/reduce-location_' into autostaging
Merge remote-tracking branch 'origin/help-text' into autostaging