[#59677630] rough version of adding individual shipments
added comment about modal window buttons
Merge branch 'shipments' into adding_individual_shipments

Conflicts:
	app/assets/javascripts/trade/controllers/shipments_controller.js.coffee
Merge branch 'develop' into adding_individual_shipments
Added license file
functionality for update and create individual shipments
shipment edit modal style
tmp list of validations on the shipments model
small fixes on shipment single edit
fixed bug on shipment client side validation
Removes filter for background image. It seems that this was breaking the scrollbars in IE8.
some tidy up on the shipments code
Merge branch 'develop' into adding_individual_shipments

Conflicts:
	app/assets/javascripts/trade/controllers/shipments_controller.js.coffee
remove reported_ fields from permitted params
make sure permit is not null before creating a record
Merge pull request #115 from unepwcmc/adding_individual_shipments

Adding individual shipments
Merge branch 'hotfix-0.3.6' into develop
updated newrelic config file
Merge branch 'hotfix-0.3.5' into develop
fixes specs