Sorting.js
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	ckanext/geodatagov/fanstatic_library/scripts/sorting.js