First commit for taxonomic aggregation of data
Merge branch 'master' into data_by_clade

Conflicts:
	app/models/data_point_uri.rb
Merge branch 'master' into data_by_clade
Merge branch 'master' into data_by_clade
Merge branch 'master' into data_by_clade
Merge branch 'master' into data_by_clade
Added ranges subtab to data tab
Merge branch 'master' into data_by_clade

Conflicts:
	app/models/data_point_uri.rb
Merge branch 'master' into data_by_clade
Merge branch 'master' into data_by_clade
Added autocomplete search for taxon names
Merge branch 'master' into data_by_clade
Fixed bug with selection of subtabs on data tab
Merge branch 'master' into data_by_clade

Conflicts:
	app/assets/javascripts/common.js
	app/controllers/data_search_controller.rb
	app/models/known_uri.rb
	app/views/known_uris/_definition.html.haml
	app/views/known_uris/_form.html.haml
	app/views/layouts/v2/data_search.html.haml
Fixed a couple bugs after the merge
Owner for Dataobjects needed to be html_safe
Updated broken route
Ooops, wrong fix for data object names.  Sigh.
Merge branch 'master' into data_by_clade

Conflicts:
	app/views/data_search/index.html.haml
	app/views/known_uris/_form.html.haml
	app/views/taxa/data/_overview_summary.haml
	app/views/taxa/data/about.html.haml
	app/views/taxa/data/glossary.html.haml
	app/views/taxa/data/index.html.haml
	app/views/taxa/overview/show.html.haml
Changing the order of presented default licenses in the resource form