combination unique genus test
Merge branch 'master' of github.com:SpeciesFileGroup/taxonworks

Conflicts:
	app/models/taxon_name.rb
combination unique genus test