list view and datasource

Conflicts:

	data.json