Merge branch 'master' of github.com:unepwcmc/SAPI into develop

Conflicts:
	app/models/trade/inclusion_validation_rule.rb
[#63610140] new table - no edits
removed sandbox_shipments_controller and fixed most of modal fields for sandbox shipment edit
[#63610140] work on sanbox shipment updating
[#63610140] fixed appendix field in modal
Merge branch 'develop' of github.com:unepwcmc/SAPI into develop
[#63610140] show current values
[#63610140] almost done!
[#63610140] setting up cancel changes on modal
[#63610140] deleting no longer used code
Merge branch 'develop' into sandbox_edits

Conflicts:
	app/assets/javascripts/trade/helpers/handlebars_helpers.js.coffee
[fixes #63610140] deleted not used property
[#63610140] post pull request fixes
Merge pull request #172 from unepwcmc/sandbox_edits

Sandbox edits