factorygirl for ICN rspec
Merge remote-tracking branch 'origin/master'

Conflicts:
	spec/models/taxon_name_spec.rb