Merge branch 'master' into pleary_dev
WEB-4674 - fixed a bug where excluded rows were no longer marked. Removed those marks for non-curators (full). Added a key at the bottom of the page (for full curators).
WIP (but functional) - key for curators and hiding things for non-curators. Working on the specs... just need one more, but it's quitting time.
Cleaning up and last bug fixes of performance improvements;
Merge branch 'master' into virtuoso

Conflicts:
	app/controllers/taxa/media_controller.rb
	app/models/taxon_concept.rb
	app/models/taxon_user_classification_filter.rb
	app/views/taxa/media/index.html.haml
Should fix the FB bug...
Grrr. This solves the FB/language menu problem...
Fixed failing spec due to recent merge
Should fix the FB bug...
Grrr. This solves the FB/language menu problem...
WIP - fixing up the bump-to-top-y-ness of known uris.
WEB-4673 Bump known uris to the top or bottom of the list. I didn't test this, it's JS... will add to acceptance tests.
Tiny fix to the width of the heading over the move column, to make sure it doesn't get too wide 'cause of the header (though I doubt it would have, really).
Fixed a potential problem which is too long to explain here, but let's just say pagination shouldn't be an issue for bumping things up/down on the known_uris page anymore.
Various improvements for collections, pages API, overview
Merge branch 'master' of github.com:EOL/eol
Fixed bug with last commit, few more small changes
Merge branch 'master' into virtuoso
Added field for attribution to KnownUris
More efficient loading of metadata for downloading data; set download limit to 2000 rows