started work on creating hybrids
[#42706185] creating hybrids
added some specs
Merge branch 'master' into hybrids

Conflicts:
	app/helpers/taxon_concept_helper.rb
	app/views/admin/taxon_concepts/edit.html.erb
Merge pull request #6 from unepwcmc/hybrids

Hybrids