Updated data

Conflicts:

	data-min.js