Now use unique sort key to sort marker by category

Conflicts:

	app/models/map/content/marker.rb
Sort category_sets