[#62454030] added some constraints to the pairing table, just because it gets on my nerves when a table has no constraints :)
Merge branch 'master' into develop
keep trade related factories together
[fixes #62447780]
[Fixes #62454030] properly import blank pairings & consider them in validations
Merge branch 'develop' into optional_unit_with_some_trade_codes

Conflicts:
	app/models/trade/inclusion_validation_rule.rb
Merge pull request #155 from unepwcmc/citestrade

[fixes #62447780]
set default autocomplete in Species+ to all ranks (in backend rather than frontend)
[#61812078]
[#61812078] some minimal styling
Merge pull request #156 from unepwcmc/optional_unit_with_some_trade_codes

Optional unit with some trade codes
Merge pull request #158 from unepwcmc/shipments_download

Shipments download
Fixed merge conflict
Added description to geo_locate. Added geoip gem