Merge branch 'master' into exemplar_cp_model
Eliminate content_parter.wikipedia and .boa
Fixed copy paste issue
Merge branch 'master' into exemplar_cp_model

Conflicts:
	spec/models/taxon_user_classification_filter_spec.rb